=== modified file 'dhis2-live-installer/build.sh'
--- dhis2-live-installer/build.sh	2010-04-09 08:05:41 +0000
+++ dhis2-live-installer/build.sh	2010-04-09 14:28:39 +0000
@@ -22,4 +22,4 @@
 mvn package
 echo "Building installer"
 cd $DHIS2_SRC/dhis2-live-installer
-mvn exec:exec
+mvn package

=== modified file 'dhis2-live-installer/pom.xml'
--- dhis2-live-installer/pom.xml	2010-04-09 11:59:31 +0000
+++ dhis2-live-installer/pom.xml	2010-04-09 14:28:39 +0000
@@ -15,19 +15,36 @@
         <version>1.1</version>
         <executions>
           <execution>
-            <goals>
+	     <id>DHIS2 Windows Lite</id>
+             <phase>package</phase>
+               <configuration>
+                <executable>${env.BITROCK_HOME}/bin/builder</executable>
+          	<arguments>
+                <argument>build</argument>
+                <argument>${basedir}/src/bitrock/DHIS2_lite.xml</argument>
+                <argument>windows</argument>
+                </arguments>
+               </configuration>
+             <goals>
               <goal>exec</goal>
             </goals>
           </execution>
+          <execution>
+             <id>DHIS2 Windows Demo</id>
+             <phase>package</phase>
+               <configuration>
+                <executable>${env.BITROCK_HOME}/bin/builder</executable>
+                <arguments>
+                <argument>build</argument>
+                <argument>${basedir}/src/bitrock/DHIS2_demo_birt.xml</argument>
+                <argument>windows</argument>
+                </arguments>
+               </configuration>
+             <goals>
+              <goal>exec</goal>
+            </goals>
+          </execution> 
         </executions>
-        <configuration>
-          <executable>${env.BITROCK_HOME}/bin/builder</executable>
-          <arguments>
-            <argument>build</argument>
-            <argument>${basedir}/src/bitrock/DHIS2_lite.xml</argument>
-            <argument>windows</argument>
-          </arguments>
-        </configuration>
       </plugin>
     </plugins>
   </build>

=== modified file 'dhis2-live-installer/src/bitrock/DHIS2.xml'
--- dhis2-live-installer/src/bitrock/DHIS2.xml	2010-04-09 11:59:31 +0000
+++ dhis2-live-installer/src/bitrock/DHIS2.xml	2010-04-09 14:28:39 +0000
@@ -14,8 +14,16 @@
             <origin>${env(DHIS2_SRC)}/dhis-2/dhis-web/dhis-web-portal/target/dhis.war</origin>
         </copyFile>
         <copyFile>
+            <abortOnError>0</abortOnError>
+            <customErrorMessage>BIRT was not detected. Skipping. </customErrorMessage>
             <destination>${build_project_directory}/temp</destination>
             <origin>${env(BIRT_WAR)}/birt.war</origin>
+            <onErrorActionList>
+                <setInstallerVariable>
+                    <name>installbirt</name>
+                    <value>FALSE</value>
+                </setInstallerVariable>
+            </onErrorActionList>
         </copyFile>
         <copyFile>
             <destination>${build_project_directory}/temp/dhis2-live.jar</destination>
@@ -307,6 +315,14 @@
             <mustExist>0</mustExist>
             <width>40</width>
         </directoryParameter>
+        <booleanParameter>
+            <name>installbirt</name>
+            <description></description>
+            <explanation></explanation>
+            <value></value>
+            <default>TRUE</default>
+            <displayStyle>radiobuttons</displayStyle>
+        </booleanParameter>
     </parameterList>
     <platformOptionsList>
         <platformOptions>

=== added file 'dhis2-live-installer/src/bitrock/DHIS2_demo_birt.xml'
--- dhis2-live-installer/src/bitrock/DHIS2_demo_birt.xml	1970-01-01 00:00:00 +0000
+++ dhis2-live-installer/src/bitrock/DHIS2_demo_birt.xml	2010-04-09 14:28:39 +0000
@@ -0,0 +1,333 @@
+<project>
+    <shortName>DHIS2</shortName>
+    <fullName>DHIS2</fullName>
+    <version>2.0.4</version>
+   <installerFilename>${product_shortname}-${product_version}-${platform_name}-demo-installer.${platform_exec_suffix}</installerFilename> 
+    <readmeFile>../../resources/files/Readme.txt</readmeFile>
+    <licenseFile>../../resources/files/Licence.txt</licenseFile>
+    <leftImage>../../resources/images/dhis2-logo-rotated.png</leftImage>
+    <logoImage>../../resources/images/dhis2-logo.png</logoImage>
+    <splashImage>../../resources/images/dhis2-logo.png</splashImage>
+    <preBuildActionList>
+        <copyFile>
+            <destination>${build_project_directory}/temp/</destination>
+            <origin>${env(DHIS2_SRC)}/dhis-2/dhis-web/dhis-web-portal/target/dhis.war</origin>
+        </copyFile>
+        <copyFile>
+            <abortOnError>0</abortOnError>
+            <customErrorMessage>BIRT was not detected. Skipping. </customErrorMessage>
+            <destination>${build_project_directory}/temp</destination>
+            <origin>${env(BIRT_WAR)}/birt.war</origin>
+            <onErrorActionList>
+                <setInstallerVariable>
+                    <name>installbirt</name>
+                    <value>FALSE</value>
+                </setInstallerVariable>
+            </onErrorActionList>
+        </copyFile>
+        <copyFile>
+            <destination>${build_project_directory}/temp/dhis2-live.jar</destination>
+            <origin>${env(DHIS2_SRC)}/dhis-live/target/dhis2-live-jar-with-dependencies.jar</origin>
+        </copyFile>
+        <copyFile>
+            <destination>${build_project_directory}/temp/dhis2-live.exe</destination>
+            <origin>${env(DHIS2_SRC)}/dhis-live/target/dhis2-live.exe</origin>
+        </copyFile>
+        <copyFile>
+            <destination>${build_project_directory}/temp/</destination>
+            <origin>${env(DHIS2_DOCS)}//target/site/en/pdf/dhis2_user_manual_en.pdf</origin>
+        </copyFile>
+    </preBuildActionList>
+    <preInstallationActionList>
+        <autodetectJava>
+            <customErrorMessage>Sorry. You must have a valide JRE installed on your machine. Download and install the latest version of Java for your machine and try to install DHIS2 again. The installer will now exit. </customErrorMessage>
+            <promptUser>0</promptUser>
+            <onErrorActionList>
+                <launchBrowser>
+                    <explanation>You will now be directed to the download site. Please install Java and rerun the DHIS2 installer. </explanation>
+                    <url>http://www.java.com/en/download/manual.jsp</url>
+                </launchBrowser>
+            </onErrorActionList>
+            <validVersionList>
+                <validVersion>
+                    <maxVersion></maxVersion>
+                    <minVersion>1.6.0_18</minVersion>
+                    <requireJDK>0</requireJDK>
+                    <vendor></vendor>
+                </validVersion>
+            </validVersionList>
+        </autodetectJava>
+    </preInstallationActionList>
+    <readyToInstallActionList>
+        <createDirectory>
+            <path>${installdir}/database</path>
+            <progressText>Creating database directory.</progressText>
+        </createDirectory>
+        <createDirectory>
+            <path>${installdir}/log</path>
+        </createDirectory>
+        <createDirectory>
+            <path>${installdir}/webapps</path>
+        </createDirectory>
+    </readyToInstallActionList>
+    <allowComponentSelection>1</allowComponentSelection>
+    <compressionAlgorithm>lzma</compressionAlgorithm>
+    <enableRollback>1</enableRollback>
+    <enableTimestamp>1</enableTimestamp>
+    <requestedExecutionLevel>highestAvailable</requestedExecutionLevel>
+    <saveRelativePaths>1</saveRelativePaths>
+    <vendor>DHIS2</vendor>
+    <componentList>
+        <component>
+            <name>dhis2live</name>
+            <description>DHIS2 Live</description>
+            <canBeEdited>0</canBeEdited>
+            <selected>1</selected>
+            <show>1</show>
+            <folderList>
+                <folder>
+                    <description>Program Files</description>
+                    <destination>${installdir}</destination>
+                    <name>programfiles</name>
+                    <platforms>all</platforms>
+                    <distributionFileList>
+                        <distributionDirectory>
+                            <origin>../../resources/conf</origin>
+                        </distributionDirectory>
+                        <distributionFile>
+                            <origin>temp/dhis2-live.jar</origin>
+                        </distributionFile>
+                    </distributionFileList>
+                    <shortcutList>
+                        <shortcut>
+                            <comment>Uninstall</comment>
+                            <exec>${installdir}/${uninstallerName}</exec>
+                            <icon></icon>
+                            <name>Uninstall ${product_fullname}</name>
+                            <path>${installdir}</path>
+                            <platforms>all</platforms>
+                            <runInTerminal>0</runInTerminal>
+                            <windowsExec>${installdir}/${uninstallerName}.exe</windowsExec>
+                            <windowsExecArgs></windowsExecArgs>
+                            <windowsIcon></windowsIcon>
+                            <windowsPath>${installdir}</windowsPath>
+                        </shortcut>
+                    </shortcutList>
+                </folder>
+                <folder>
+                    <description>Program Files</description>
+                    <destination>${installdir}</destination>
+                    <name>programfileslinux</name>
+                    <platforms>linux</platforms>
+                    <distributionFileList>
+                        <distributionFile>
+                            <origin>../../resources/scripts/linux/startup.sh</origin>
+                        </distributionFile>
+                    </distributionFileList>
+                </folder>
+                <folder>
+                    <description>Program Files</description>
+                    <destination>${installdir}</destination>
+                    <name>programfileswindows</name>
+                    <platforms>windows</platforms>
+                    <distributionFileList>
+                        <distributionFile>
+                            <origin>temp/dhis2-live.exe</origin>
+                        </distributionFile>
+                    </distributionFileList>
+                </folder>
+                <folder>
+                    <description>Program Files</description>
+                    <destination>${installdir}</destination>
+                    <name>programfilesosx</name>
+                    <platforms>osx</platforms>
+                </folder>
+            </folderList>
+            <startMenuShortcutList>
+                <startMenuShortcut>
+                    <comment>Uninstall ${product_fullname}</comment>
+                    <name>Uninstall ${product_fullname}</name>
+                    <runInTerminal>0</runInTerminal>
+                    <windowsExec>${installdir}/${uninstallerName}.exe</windowsExec>
+                    <windowsExecArgs></windowsExecArgs>
+                    <windowsIcon></windowsIcon>
+                    <windowsPath>${installdir}/</windowsPath>
+                </startMenuShortcut>
+                <startMenuShortcut>
+                    <comment>Start DHIS2</comment>
+                    <name>Start DHIS2</name>
+                    <runInTerminal>0</runInTerminal>
+                    <windowsExec>${installdir}/dhis2-live.exe</windowsExec>
+                    <windowsExecArgs></windowsExecArgs>
+                    <windowsIcon></windowsIcon>
+                    <windowsPath></windowsPath>
+                </startMenuShortcut>
+                <startMenuFileShortcut>
+                    <comment>DHIS2 Docs</comment>
+                    <filePath>${installdir}/docs/dhis2_user_manual_en.pdf</filePath>
+                    <name>DHIS2 Documentation</name>
+                    <runInTerminal>0</runInTerminal>
+                    <windowsIcon></windowsIcon>
+                </startMenuFileShortcut>
+            </startMenuShortcutList>
+        </component>
+        <component>
+            <name>birt</name>
+            <description>Birt Reporting Framework</description>
+            <canBeEdited>1</canBeEdited>
+            <detailedDescription>The Birt Reporting Framework. Install this compoenent if you plan to use BIRT reports.</detailedDescription>
+            <selected>0</selected>
+            <show>1</show>
+            <folderList>
+                <folder>
+                    <description>birt</description>
+                    <destination>${installdir}/webapps/birt</destination>
+                    <name>birt</name>
+                    <platforms>all</platforms>
+                    <distributionFileList>
+                        <distributionFile>
+                            <origin>temp/birt.war</origin>
+                        </distributionFile>
+                    </distributionFileList>
+                </folder>
+            </folderList>
+            <postInstallationActionList>
+                <unzip>
+                    <destinationDirectory>${installdir}/webapps/birt/</destinationDirectory>
+                    <explanation>Unpacking BIRT</explanation>
+                    <progressText>Unpacking BIRT</progressText>
+                    <zipFile>${installdir}/webapps/birt/birt.war</zipFile>
+                </unzip>
+                <deleteFile>
+                    <explanation>Cleaning up BIRT.</explanation>
+                    <path>${installdir}/webapps/birt/birt.war</path>
+                    <progressText>Cleaning up BIRT.</progressText>
+                </deleteFile>
+            </postInstallationActionList>
+        </component>
+        <component>
+            <name>demodb</name>
+            <description>Demo database</description>
+            <canBeEdited>1</canBeEdited>
+            <selected>0</selected>
+            <show>1</show>
+            <folderList>
+                <folder>
+                    <description>demodb</description>
+                    <destination>${installdir}/database</destination>
+                    <name>demodb</name>
+                    <platforms>all</platforms>
+                    <distributionFileList>
+                        <distributionFile>
+                            <origin>../../resources/demodb/database.h2.db</origin>
+                        </distributionFile>
+                        <distributionFile>
+                            <origin>../../resources/demodb/database.trace.db</origin>
+                        </distributionFile>
+                        <distributionFile>
+                            <origin>../../resources/demodb/dhis2.12.log.db</origin>
+                        </distributionFile>
+                        <distributionFile>
+                            <origin>../../resources/demodb/dhis2.data.db</origin>
+                        </distributionFile>
+                        <distributionFile>
+                            <origin>../../resources/demodb/dhis2.index.db</origin>
+                        </distributionFile>
+                        <distributionFile>
+                            <origin>../../resources/demodb/dhis2.trace.db</origin>
+                        </distributionFile>
+                    </distributionFileList>
+                </folder>
+            </folderList>
+        </component>
+        <component>
+            <name>dhis2core</name>
+            <description>DHIS2 Core</description>
+            <canBeEdited>0</canBeEdited>
+            <selected>1</selected>
+            <show>1</show>
+            <folderList>
+                <folder>
+                    <description>dhiscore</description>
+                    <destination>${installdir}/webapps/dhis</destination>
+                    <name>dhiscore</name>
+                    <platforms>all</platforms>
+                    <distributionFileList>
+                        <distributionFile>
+                            <origin>temp/dhis.war</origin>
+                        </distributionFile>
+                    </distributionFileList>
+                </folder>
+            </folderList>
+            <postInstallationActionList>
+                <unzip>
+                    <destinationDirectory>${installdir}/webapps/dhis/</destinationDirectory>
+                    <explanation>Unzipping DHIS2 core.</explanation>
+                    <progressText>Unzipping DHIS2 core.</progressText>
+                    <zipFile>${installdir}/webapps/dhis/dhis.war</zipFile>
+                </unzip>
+                <deleteFile>
+                    <explanation>Cleaning up DHIS2 war file.</explanation>
+                    <path>${installdir}/webapps/dhis/dhis.war</path>
+                    <progressText>Cleaning up DHIS2 war file</progressText>
+                </deleteFile>
+            </postInstallationActionList>
+        </component>
+        <component>
+            <name>dhis2docs</name>
+            <description>DHIS2 Docs</description>
+            <canBeEdited>1</canBeEdited>
+            <selected>1</selected>
+            <show>1</show>
+            <folderList>
+                <folder>
+                    <description>docs</description>
+                    <destination>${installdir}/docs</destination>
+                    <name>docs</name>
+                    <platforms>all</platforms>
+                    <distributionFileList>
+                        <distributionFile>
+                            <origin>temp/dhis2_user_manual_en.pdf</origin>
+                        </distributionFile>
+                    </distributionFileList>
+                </folder>
+            </folderList>
+        </component>
+    </componentList>
+    <finalPageActionList>
+        <runProgram>
+            <program>${installdir}\dhis2-live.exe</program>
+            <programArguments></programArguments>
+            <progressText>Do you want to launch ${product_fullname} now?</progressText>
+        </runProgram>
+    </finalPageActionList>
+    <parameterList>
+        <directoryParameter>
+            <name>installdir</name>
+            <description>Installer.Parameter.installdir.description</description>
+            <explanation>Installer.Parameter.installdir.explanation</explanation>
+            <value></value>
+            <default>${platform_install_prefix}/${product_shortname}-${product_version}</default>
+            <allowEmptyValue>0</allowEmptyValue>
+            <ask>yes</ask>
+            <cliOptionName>prefix</cliOptionName>
+            <mustBeWritable>yes</mustBeWritable>
+            <mustExist>0</mustExist>
+            <width>40</width>
+        </directoryParameter>
+        <booleanParameter>
+            <name>installbirt</name>
+            <description></description>
+            <explanation></explanation>
+            <value></value>
+            <default>TRUE</default>
+            <displayStyle>radiobuttons</displayStyle>
+        </booleanParameter>
+    </parameterList>
+    <platformOptionsList>
+        <platformOptions>
+            <platform>windows</platform>
+        </platformOptions>
+    </platformOptionsList>
+</project>
+

=== modified file 'dhis2-live-installer/src/bitrock/DHIS2_lite.xml'
--- dhis2-live-installer/src/bitrock/DHIS2_lite.xml	2010-04-09 11:59:31 +0000
+++ dhis2-live-installer/src/bitrock/DHIS2_lite.xml	2010-04-09 14:28:39 +0000
@@ -2,7 +2,7 @@
     <shortName>DHIS2</shortName>
     <fullName>DHIS2</fullName>
     <version>2.0.4</version>
-    <installerFilename>${product_shortname}-${product_version}-${platform_name}--lite-installer.${platform_exec_suffix}</installerFilename>
+   <installerFilename>${product_shortname}-${product_version}-${platform_name}-lite-installer.${platform_exec_suffix}</installerFilename> 
     <readmeFile>../../resources/files/Readme.txt</readmeFile>
     <licenseFile>../../resources/files/Licence.txt</licenseFile>
     <leftImage>../../resources/images/dhis2-logo-rotated.png</leftImage>
@@ -10,16 +10,20 @@
     <splashImage>../../resources/images/dhis2-logo.png</splashImage>
     <preBuildActionList>
         <copyFile>
+            <destination>${build_project_directory}/temp/</destination>
+            <origin>${env(DHIS2_SRC)}/dhis-2/dhis-web/dhis-web-portal/target/dhis.war</origin>
+        </copyFile>
+        <copyFile>
             <destination>${build_project_directory}/temp/dhis2-live.jar</destination>
             <origin>${env(DHIS2_SRC)}/dhis-live/target/dhis2-live-jar-with-dependencies.jar</origin>
         </copyFile>
         <copyFile>
-            <destination>${build_project_directory}/temp/dhis-live.exe</destination>
+            <destination>${build_project_directory}/temp/dhis2-live.exe</destination>
             <origin>${env(DHIS2_SRC)}/dhis-live/target/dhis2-live.exe</origin>
         </copyFile>
         <copyFile>
             <destination>${build_project_directory}/temp/</destination>
-            <origin>${env(DHIS2_DOCS)}/target/site/en/pdf/dhis2_user_manual_en.pdf</origin>
+            <origin>${env(DHIS2_DOCS)}//target/site/en/pdf/dhis2_user_manual_en.pdf</origin>
         </copyFile>
     </preBuildActionList>
     <preInstallationActionList>

=== added file 'dhis2-live-installer/src/bitrock/DHIS2_pg.xml'
--- dhis2-live-installer/src/bitrock/DHIS2_pg.xml	1970-01-01 00:00:00 +0000
+++ dhis2-live-installer/src/bitrock/DHIS2_pg.xml	2010-04-09 14:28:39 +0000
@@ -0,0 +1,419 @@
+<project>
+    <shortName>DHIS2</shortName>
+    <fullName>DHIS2</fullName>
+    <version>2.0.3</version>
+    <installerFilename>${product_shortname}-${product_version}-${platform_name}--lite-installer.${platform_exec_suffix}</installerFilename>
+    <readmeFile>../../resources/files/Readme.txt</readmeFile>
+    <licenseFile>../../resources/files/Licence.txt</licenseFile>
+    <leftImage>../../resources/images/dhis2-logo-rotated.png</leftImage>
+    <logoImage>../../resources/images/dhis2-logo.png</logoImage>
+    <splashImage>../../resources/images/dhis2-logo.png</splashImage>
+    <preBuildActionList>
+        <copyFile>
+            <abortOnError>0</abortOnError>
+            <customErrorMessage>BIRT was not detected. Skipping. </customErrorMessage>
+            <destination>${build_project_directory}/temp</destination>
+            <origin>${env(BIRT_WAR)}/birt.war</origin>
+            <onErrorActionList>
+                <setInstallerVariable>
+                    <name>installbirt</name>
+                    <value>FALSE</value>
+                </setInstallerVariable>
+            </onErrorActionList>
+            <ruleList>
+                <fileExists>
+                    <negate>1</negate>
+                    <path>{$build_project_directory}/temp/birt.war</path>
+                </fileExists>
+            </ruleList>
+        </copyFile>
+        <copyFile>
+            <destination>${build_project_directory}/temp/dhis2-live.jar</destination>
+            <origin>${env(DHIS2_SRC)}/dhis-live/target/dhis2-live-jar-with-dependencies.jar</origin>
+            <ruleList>
+                <fileExists>
+                    <negate>1</negate>
+                    <path>{$build_project_directory}/temp/dhis2-live.jar</path>
+                </fileExists>
+            </ruleList>
+        </copyFile>
+        <copyFile>
+            <destination>${build_project_directory}/temp/dhis2-live.exe</destination>
+            <origin>${env(DHIS2_SRC)}/dhis-live/target/dhis2-live.exe</origin>
+            <ruleList>
+                <fileExists>
+                    <negate>1</negate>
+                    <path>{$project_build_directory}/temp/dhis2-live.exe</path>
+                </fileExists>
+            </ruleList>
+        </copyFile>
+        <copyFile>
+            <destination>${build_project_directory}/temp/</destination>
+            <origin>${env(DHIS2_DOCS)}/target/site/en/pdf/dhis2_user_manual_en.pdf</origin>
+            <ruleList>
+                <fileExists>
+                    <negate>1</negate>
+                    <path>{$build_project_directory}/temp/dhis2_user_manual.pdf</path>
+                </fileExists>
+            </ruleList>
+        </copyFile>
+    </preBuildActionList>
+    <preInstallationActionList>
+        <autodetectJava>
+            <customErrorMessage>Sorry. You must have a valide JRE installed on your machine. Download and install the latest version of Java for your machine and try to install DHIS2 again. The installer will now exit. </customErrorMessage>
+            <promptUser>0</promptUser>
+            <onErrorActionList>
+                <launchBrowser>
+                    <explanation>You will now be directed to the download site. Please install Java and rerun the DHIS2 installer. </explanation>
+                    <url>http://www.java.com/en/download/manual.jsp</url>
+                </launchBrowser>
+            </onErrorActionList>
+            <validVersionList>
+                <validVersion>
+                    <maxVersion></maxVersion>
+                    <minVersion>1.6.0_14</minVersion>
+                    <requireJDK>0</requireJDK>
+                    <vendor></vendor>
+                </validVersion>
+            </validVersionList>
+        </autodetectJava>
+    </preInstallationActionList>
+    <readyToInstallActionList>
+        <createDirectory>
+            <path>${installdir}/log</path>
+        </createDirectory>
+        <createDirectory>
+            <path>${installdir}/webapps</path>
+        </createDirectory>
+    </readyToInstallActionList>
+    <allowComponentSelection>1</allowComponentSelection>
+    <compressionAlgorithm>lzma</compressionAlgorithm>
+    <enableRollback>1</enableRollback>
+    <enableTimestamp>1</enableTimestamp>
+    <requestedExecutionLevel>highestAvailable</requestedExecutionLevel>
+    <saveRelativePaths>1</saveRelativePaths>
+    <vendor>DHIS2</vendor>
+    <componentList>
+        <component>
+            <name>dhis2live</name>
+            <description>DHIS2 Live</description>
+            <canBeEdited>0</canBeEdited>
+            <selected>1</selected>
+            <show>1</show>
+            <folderList>
+                <folder>
+                    <description>Program Files</description>
+                    <destination>${installdir}</destination>
+                    <name>programfiles</name>
+                    <platforms>all</platforms>
+                    <distributionFileList>
+                        <distributionDirectory>
+                            <origin>../../resources/conf</origin>
+                        </distributionDirectory>
+                        <distributionFile>
+                            <origin>temp/dhis2-live.jar</origin>
+                        </distributionFile>
+                    </distributionFileList>
+                    <shortcutList>
+                        <shortcut>
+                            <comment>Uninstall</comment>
+                            <exec>${installdir}/${uninstallerName}</exec>
+                            <icon></icon>
+                            <name>Uninstall ${product_fullname}</name>
+                            <path>${installdir}</path>
+                            <platforms>all</platforms>
+                            <runInTerminal>0</runInTerminal>
+                            <windowsExec>${installdir}/${uninstallerName}.exe</windowsExec>
+                            <windowsExecArgs></windowsExecArgs>
+                            <windowsIcon></windowsIcon>
+                            <windowsPath>${installdir}</windowsPath>
+                        </shortcut>
+                    </shortcutList>
+                </folder>
+                <folder>
+                    <description>Program Files</description>
+                    <destination>${installdir}</destination>
+                    <name>programfileslinux</name>
+                    <platforms>linux</platforms>
+                    <distributionFileList>
+                        <distributionFile>
+                            <origin>../../resources/scripts/linux/startup.sh</origin>
+                        </distributionFile>
+                    </distributionFileList>
+                </folder>
+                <folder>
+                    <description>Program Files</description>
+                    <destination>${installdir}</destination>
+                    <name>programfileswindows</name>
+                    <platforms>windows</platforms>
+                    <distributionFileList>
+                        <distributionFile>
+                            <origin>temp/dhis2-live.exe</origin>
+                        </distributionFile>
+                    </distributionFileList>
+                </folder>
+                <folder>
+                    <description>Program Files</description>
+                    <destination>${installdir}</destination>
+                    <name>programfilesosx</name>
+                    <platforms>osx</platforms>
+                </folder>
+            </folderList>
+            <startMenuShortcutList>
+                <startMenuShortcut>
+                    <comment>Uninstall ${product_fullname}</comment>
+                    <name>Uninstall ${product_fullname}</name>
+                    <runInTerminal>0</runInTerminal>
+                    <windowsExec>${installdir}/${uninstallerName}.exe</windowsExec>
+                    <windowsExecArgs></windowsExecArgs>
+                    <windowsIcon></windowsIcon>
+                    <windowsPath>${installdir}/</windowsPath>
+                </startMenuShortcut>
+                <startMenuShortcut>
+                    <comment>Start DHIS2</comment>
+                    <name>Start DHIS2</name>
+                    <runInTerminal>0</runInTerminal>
+                    <windowsExec>${installdir}/dhis2-live.exe</windowsExec>
+                    <windowsExecArgs></windowsExecArgs>
+                    <windowsIcon></windowsIcon>
+                    <windowsPath></windowsPath>
+                </startMenuShortcut>
+                <startMenuFileShortcut>
+                    <comment>DHIS2 Docs</comment>
+                    <filePath>${installdir}/docs/dhis2_user_manual_en.pdf</filePath>
+                    <name>DHIS2 Documentation</name>
+                    <runInTerminal>0</runInTerminal>
+                    <windowsIcon></windowsIcon>
+                </startMenuFileShortcut>
+            </startMenuShortcutList>
+        </component>
+        <component>
+            <name>dhis2core</name>
+            <description>DHIS2 Core</description>
+            <canBeEdited>0</canBeEdited>
+            <selected>1</selected>
+            <show>1</show>
+            <folderList>
+                <folder>
+                    <description>dhiscore</description>
+                    <destination>${installdir}/webapps/dhis</destination>
+                    <name>dhiscore</name>
+                    <platforms>all</platforms>
+                    <distributionFileList>
+                        <distributionFile>
+                            <origin>temp/dhis.war</origin>
+                        </distributionFile>
+                    </distributionFileList>
+                </folder>
+            </folderList>
+            <postInstallationActionList>
+                <unzip>
+                    <destinationDirectory>${installdir}/webapps/dhis/</destinationDirectory>
+                    <explanation>Unzipping DHIS2 core.</explanation>
+                    <progressText>Unzipping DHIS2 core.</progressText>
+                    <zipFile>${installdir}/webapps/dhis/dhis.war</zipFile>
+                </unzip>
+                <deleteFile>
+                    <explanation>Cleaning up DHIS2 war file.</explanation>
+                    <path>${installdir}/webapps/dhis/dhis.war</path>
+                    <progressText>Cleaning up DHIS2 war file</progressText>
+                </deleteFile>
+            </postInstallationActionList>
+        </component>
+        <component>
+            <name>dhis2docs</name>
+            <description>DHIS2 Docs</description>
+            <canBeEdited>1</canBeEdited>
+            <selected>1</selected>
+            <show>1</show>
+            <folderList>
+                <folder>
+                    <description>docs</description>
+                    <destination>${installdir}/docs</destination>
+                    <name>docs</name>
+                    <platforms>all</platforms>
+                    <distributionFileList>
+                        <distributionFile>
+                            <origin>temp/dhis2_user_manual_en.pdf</origin>
+                        </distributionFile>
+                    </distributionFileList>
+                </folder>
+            </folderList>
+        </component>
+        <component>
+            <name>embeddedjre</name>
+            <description>Java Runtime Enviornment</description>
+            <canBeEdited>0</canBeEdited>
+            <selected>1</selected>
+            <show>1</show>
+            <folderList>
+                <folder>
+                    <description>jre</description>
+                    <destination>${installdir}/</destination>
+                    <name>jre</name>
+                    <platforms>windows</platforms>
+                    <distributionFileList>
+                        <distributionDirectory>
+                            <origin>temp/jre6</origin>
+                        </distributionDirectory>
+                    </distributionFileList>
+                </folder>
+            </folderList>
+        </component>
+        <component>
+            <name>postgres</name>
+            <description>Postgresql Database</description>
+            <canBeEdited>1</canBeEdited>
+            <selected>0</selected>
+            <show>0</show>
+            <folderList>
+                <folder>
+                    <description>postgres</description>
+                    <destination>${installdir}/temp/postgres</destination>
+                    <name>postgres</name>
+                    <platforms>windows</platforms>
+                    <distributionFileList>
+                        <distributionFile>
+                            <origin>temp/postgresql-8.4.2-1-windows.exe</origin>
+                        </distributionFile>
+                        <distributionFile>
+                            <origin>../../resources/scripts/win32/generate_user.bat</origin>
+                        </distributionFile>
+                    </distributionFileList>
+                </folder>
+            </folderList>
+            <postInstallationActionList>
+                <runProgram>
+                    <program>${installdir}/temp/postgres/generate_user.bat</program>
+                    <programArguments></programArguments>
+                </runProgram>
+                <runProgram>
+                    <program>${installdir}/temp/postgres/postgresql-8.4.2-1-windows.exe</program>
+                    <programArguments>--mode unattended  --port 5433 --serviceaccount pg_dhis2 --servicepassword postgres</programArguments>
+                </runProgram>
+            </postInstallationActionList>
+            <preUninstallationActionList>
+                <showQuestion>
+                    <default>yes</default>
+                    <text>Do you want to uninstall the Postgresql server?</text>
+                    <variable>pg_uninstall</variable>
+                </showQuestion>
+                <runProgram>
+                    <program>${installdir}/postgres/uninstall-postgres.exe</program>
+                    <programArguments></programArguments>
+                    <ruleList>
+                        <compareValues>
+                            <logic>equals</logic>
+                            <value1>pg_uninstall</value1>
+                            <value2>yes</value2>
+                        </compareValues>
+                    </ruleList>
+                </runProgram>
+            </preUninstallationActionList>
+        </component>
+        <component>
+            <name>birt</name>
+            <description>BIRT Reporting Framework</description>
+            <canBeEdited>1</canBeEdited>
+            <selected>0</selected>
+            <show>1</show>
+            <folderList>
+                <folder>
+                    <description>birt_dest</description>
+                    <destination>${installdir}/webapps/birt/</destination>
+                    <name>birt_dest</name>
+                    <platforms>all</platforms>
+                    <distributionFileList>
+                        <distributionFile>
+                            <origin>temp/birt.war</origin>
+                        </distributionFile>
+                    </distributionFileList>
+                </folder>
+            </folderList>
+            <postInstallationActionList>
+                <unzip>
+                    <destinationDirectory>${installdir}/webapps/birt/</destinationDirectory>
+                    <explanation>Unzipping BIRT.</explanation>
+                    <progressText>Unzipping BIRT.</progressText>
+                    <zipFile>${installdir}/webapps/birt/birt.war</zipFile>
+                </unzip>
+                <deleteFile>
+                    <explanation>Cleaning up BIRT.</explanation>
+                    <path>${installdir}/webapps/birt/birt.war</path>
+                    <progressText>Cleaning up BIRT.</progressText>
+                </deleteFile>
+            </postInstallationActionList>
+        </component>
+        <component>
+            <name>h2</name>
+            <description>H2 Database Framework</description>
+            <canBeEdited>1</canBeEdited>
+            <selected>0</selected>
+            <show>0</show>
+            <readyToInstallActionList>
+                <createDirectory>
+                    <path>${installdir}/database</path>
+                </createDirectory>
+            </readyToInstallActionList>
+        </component>
+    </componentList>
+    <finalPageActionList>
+        <runProgram>
+            <program>${installdir}\dhis2-live.exe</program>
+            <programArguments></programArguments>
+            <progressText>Do you want to launch ${product_fullname} now?</progressText>
+        </runProgram>
+    </finalPageActionList>
+    <parameterList>
+        <directoryParameter>
+            <name>installdir</name>
+            <description>Installer.Parameter.installdir.description</description>
+            <explanation>Installer.Parameter.installdir.explanation</explanation>
+            <value></value>
+            <default>${platform_install_prefix}/${product_shortname}-${product_version}</default>
+            <allowEmptyValue>0</allowEmptyValue>
+            <ask>yes</ask>
+            <cliOptionName>prefix</cliOptionName>
+            <mustBeWritable>yes</mustBeWritable>
+            <mustExist>0</mustExist>
+            <width>40</width>
+        </directoryParameter>
+        <choiceParameter>
+            <name>database</name>
+            <title>Please select a database system. </title>
+            <description>Please select a database system. </description>
+            <explanation></explanation>
+            <value>database</value>
+            <default>postgres</default>
+            <allowEmptyValue>0</allowEmptyValue>
+            <displayType>combobox</displayType>
+            <width>40</width>
+            <optionList>
+                <option>
+                    <description>H2</description>
+                    <image></image>
+                    <text>H2</text>
+                    <value>h2</value>
+                </option>
+                <option>
+                    <description>PostgreSQL</description>
+                    <image></image>
+                    <text>PostgreSQL</text>
+                    <value>postgres</value>
+                </option>
+            </optionList>
+            <postShowPageActionList>
+                <componentSelection>
+                    <deselect></deselect>
+                    <select>${database}</select>
+                </componentSelection>
+            </postShowPageActionList>
+        </choiceParameter>
+    </parameterList>
+    <platformOptionsList>
+        <platformOptions>
+            <platform>windows</platform>
+        </platformOptions>
+    </platformOptionsList>
+</project>
+

=== added directory 'dhis2-live-installer/src/bitrock/temp'