← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16467: Removing unused installers. Will place this in a seperate branch.

 

------------------------------------------------------------
revno: 16467
committer: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-08-21 11:11:07 +0200
message:
  Removing unused installers. Will place this in a seperate branch.
removed:
  installers/
  installers/.bzrignore
  installers/INSTALLER-README.txt
  installers/LICENSE.txt
  installers/build.bat
  installers/build.sh
  installers/pom.xml
  installers/resources/
  installers/resources/browser/
  installers/resources/conf/
  installers/resources/conf/documents/
  installers/resources/conf/excelreporting/
  installers/resources/conf/excelreporting/temp/
  installers/resources/conf/generic_hibernate.properties
  installers/resources/conf/hibernate.properties
  installers/resources/conf/importexport/
  installers/resources/conf/importexport/ibatisConfiguration.xml
  installers/resources/conf/jetty.port
  installers/resources/conf/reports/
  installers/resources/conf/reports/reportConfiguration.xml
  installers/resources/conf/rt/
  installers/resources/conf/rt/design/
  installers/resources/conf/rt/design/jrxml/
  installers/resources/conf/rt/design/xml/
  installers/resources/demodb/
  installers/resources/dhis-live/
  installers/resources/docs/
  installers/resources/files/
  installers/resources/files/Licence.txt
  installers/resources/files/README.html
  installers/resources/files/Readme.txt
  installers/resources/files/Readme_generic.txt
  installers/resources/images/
  installers/resources/images/dhis2-logo-blue-rotated.png
  installers/resources/images/dhis2-logo-blue.png
  installers/resources/images/dhis2-logo-rotated.png
  installers/resources/images/dhis2-logo.png
  installers/resources/images/dhis2-splash-blue.png
  installers/resources/images/dhis2.ico
  installers/resources/jre/
  installers/resources/postgres/
  installers/resources/postgres/dhis2db.backup
  installers/resources/postgres/restore_db.bat
  installers/resources/postgres/restore_db_psql.bat
  installers/resources/scripts/
  installers/resources/scripts/linux/
  installers/resources/scripts/linux/startup.sh
  installers/resources/scripts/win32/
  installers/resources/webapps/
  installers/resources/webapps/birt/
  installers/resources/webapps/dhis/
  installers/src/
  installers/src/bitrock/
  installers/src/bitrock/DHIS2.xml
  installers/src/bitrock/DHIS2_demo_birt.xml
  installers/src/bitrock/DHIS2_live.xml
  installers/src/bitrock/DHIS2_live_embedded_en.xml
  installers/src/bitrock/DHIS2_live_embedded_fr.xml
  installers/src/bitrock/DHIS2_pg.xml
  installers/src/bitrock/DHIS2_pginstaller.xml
  installers/src/bitrock/DHIS2_pginstaller_generic.xml
  installers/src/bitrock/temp/
  installers/src/izpack/
  installers/src/izpack/ProcessPanel.Spec.xml
  installers/src/izpack/install.xml
  installers/src/izpack/shortcutSpec.xml
  installers/src/nsis/
  installers/src/nsis/dhis.nsi


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== removed directory 'installers'
=== removed file 'installers/.bzrignore'
--- installers/.bzrignore	2010-03-02 06:52:28 +0000
+++ installers/.bzrignore	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-dhis2_install.jar
-dhis2-2.0.3.war
-*.war
-*.pdf
-dhis2-live.jar
-dhis2_user_manual_en.pdf
-webapps/dhis
-webapps/birt
-*.db
-
-
-

=== removed file 'installers/INSTALLER-README.txt'
--- installers/INSTALLER-README.txt	2011-03-10 18:46:30 +0000
+++ installers/INSTALLER-README.txt	1970-01-01 00:00:00 +0000
@@ -1,132 +0,0 @@
-Thanks for downloading the DHIS2 Live installer. The aim of this project is to 
-create a simple process for the complete build of DHIS2 with the aim of deployment
-to a desktop computer. The installer, along with the build script should build
-a complete DHIS2 system ready for deployment from source.
-
-There are several different installers, utilizing different framworks, and which are intented
-for different purposes and deployment architectures. 
-
-
-BitRock installer notes
-
- 
-The current install will build a Windows executable which will offer an install of Postgresql, Java, 
-and a template DHIS2 database. The database can be easily replaced by a Postgresql dump and restored instead
-of the empty template databse. 
-The source of the current installer can be found in the file named DHIS2_pginstaller.
-  A few alternative installer flavors utilizing Bitrock are described at the end of this document.
-
-It is critical that you set all of the environment variables to the correct paths in your system. 
-Modify the environment variables in the build.sh (on Linux) or build.bat (on Windows) script to suit your needs. 
-
-
-There are several variables that you will need to set.
-Here are some examples, modify them in the script to suit your local system. 
-
-1) This variable should point to your local copy of the JDK. 
- JAVA_HOME=/usr/local/java/jdk1.6.0_10/
- 
-2) Be sure that maven is accessible in your path. 
- PATH=$PATH:/home/wheel/apache-maven-2.2.1/bin/
- 
-3) This variable is necessary during  the installer build process and should point to your local copy of the
-BitRock install builder executable. You can get a copy of BitRock install builder from here
-http://installbuilder.bitrock.com/download-step-2.html.
-
- Install it somewhere on your system and
-point the environment variable to the correct directory.
- Example on Linux
- 
- BITROCK_HOME=/home/wheel/installbuilder-6.2.7/bin/builder
- Example On Windows
- 
- BITROCK_HOME="c:\Program Files\BitRock InstallBuilder Professional 6.5.6\bin\builder-cli.exe"
-
-5) This variable should point to the root directory of the source of the documentation branch.  
-
- DHIS2_DOCS="/home/wheel/workspace/dhis2-docbook-docs/"
- 
- DHIS2_DOCS=c:\dhis2\dhis2-docbook-docs
- 
-6) This variable should point to your copy of the dhis2 main source branch. 
- 
- On Linux
- 
- DHIS2_SRC="/home/wheel/workspace/dhis2"
-
- On Windows
- DHIS2_SRC=c:\dhis2
-  
-My directory structure looks something like this..
-/workspace
-|_dhis-2 (contains the DHIS 2 source code)
-|_dhis2-docbook-docs (contains the DHIS2 documentation source) 
-|_dhis2-live-installer (contains the Installer source)
-|_dhis-live (contains the DHIS Live source)
-
-To get started just execute, just go to the dhis2-live-installer directory
-and execute the build.sh script if you are on Linux (be sure it is executable)
-
-There are several options you will need to pass to the build script. 
-
-./build.sh all Build everything. 
-./build.sh docs Build only the documentation.
-./build.sh installer Build only the installer.
-./build.sh dhis2 Build only DHIS2. 
-./build.sh live Build only the DHIS2 Live wrapper.
-
-
-
-
-There are a number of other installers that will be generated for different purposes. 
-
-1)DHIS2 Windows Live
-
-This version of the installer is appropriate for Microsoft Windows with a pre-existing JRE.
-
-2) DHIS2 Windows Embedded JRE
-
-This version of the installer will include a pre-packed:
-
-o JRE (Java Runtime Edition). This version therefore will not require a user to have Java pre-installed on their machine, but will 
-increase the size of the installer by about 30 MB. Place a copy of the JRE in /resources/jre/jre6.
-Note that JRE is referring to the extracted collection of files, not the Windows executable installer.
-One way to obtain this is to install JRE on Windows and copy the extracted JRE directory into this project.
-
-o Firefox browser. Place a copy of Firefox Portable in /resources/browser/FirefoxPortable. Note that Firefox portable is referring
-to the extracted collection of files, not the Windows executable installer. One way to obtain this is to install Firefox portable
-on Windows and copy the extracted FirefoxPortable directory into this project.
-
-o Demo database. Place a copy of the H2 demo database (called "demo.h2.db") into resources/demodb.
-
-You will now enter into a rather lengthy
-process depending on the speed of your machine. At the end you will
-have a Windows installer based on the latest source code and
-documentation. These will be output to the BITROCK_HOME/output
-directory.
-
-
-IZPack Installer
-
-
-The second installer is based on IZPack and may be more appropriate
-for those that need a relatively simply build process, without having Maven installed.
-It is recommended to use the BitRock installer as the IZPack installer is no longer maintained. 
-
-Basically, you will need to populate some different directories with prerequisites. 
-
-1) Put everything you need for PostgreSQL in the postgres directory.This usually involves unzipping that installer on the PostgreSQL website. 
-2) Put an offline version of Java (to be sure you have a recent version) in the /java directory. Be sure that the file name matches that in the install.xml file
-3) Put the dhis2_user_manual_en.pdf from the documentation branch into the /docs directory
-4) Change the hibernate.properties file to set your needs. 
-5) Compile with the IZPack compiler.
-
-Questions about these installer can be directed to Jason Pickering <jason.p.pickering@xxxxxxxxx>. 
-
-
-
-NSIS Installer
-
-This installer (located in the /src/nsis) folder is based on the NSIS installer framework (http://nsis.sourceforge.net/)
-. This installer will install MySQL, Tomcat, Java  (if needed) and Google Chrome and of course DHIS2, 
-as well as restoring the MySQL database from a file included in the installer itself. 
\ No newline at end of file

=== removed file 'installers/LICENSE.txt'
--- installers/LICENSE.txt	2010-03-02 06:52:28 +0000
+++ installers/LICENSE.txt	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-Copyright (c) 2004-2007, University of Oslo
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-* Neither the name of the HISP project nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

=== removed file 'installers/build.bat'
--- installers/build.bat	2011-03-17 13:01:21 +0000
+++ installers/build.bat	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-
-
-REM Adjust these environment variables to suit your system.
-REM They are needed by this build script as well as maven during the build.
-
-REM Path to the Java SDK
-JAVA_HOME="C:\Program Files\Java\jdk1.6.0_10\"
-
-REM Be sure maven is in your path
-PATH=%PATH%;"C:\apache-maven-2.2.1\bin\"
-
-REM Be sure that the Bitrock installer is in your path
-BITROCK_HOME="C:\Program Files\BitRock InstallBuilder Professional 6.2.7"
-
-REM If you are including Birt in the build, be sure it is available here
-BIRT_WAR="C:\apache-tomcat-6.0.18\webapps\birt\"
-
-REM Path to the root of the documentation branch source tree
-DHIS2_DOCS="C:\src\dhis2-docbook-docs"
-
-REM Path to the root of the DHIS2 branch source tree
-DHIS2_SRC="C:\src\dhis2"
-
-REM Path to the root of the DHIS2 Live installer source tree
-DHIS2_INSTALL="C:\src\dhis2-live-installer"
-
-SET %JAVA_HOME%
-SET %PATH%
-SET %BITROCK_HOME%
-SET %BIRT_WAR%
-SET %DHIS2_DOCS%
-SET %DHIS2_SRC%
-SET %DHIS2_INSTALL%
-
-echo "Building DHIS 2 Core..."
-cd %DHIS2_SRC%\dhis-2
-mvn clean install -Dtest=skip -DfailIfNoTests=false
-echo "Building DHIS 2 Web..."
-cd dhis-web
-mvn clean install -Dtest=skip -DfailIfNoTests=false
-echo "Packing DHIS 2 Web Portal..."
-cd dhis-web-portal
-mvn clean install -Dtest=skip -DfailIfNoTests=false
-echo "Builidng DHIS2 Live Package"
-cd %DHIS2_SRC%\dhis-live
-mvn clean package -Dtest=skip -DfailIfNoTests=false
-echo "Building documentation"
-cd %DHIS2_DOCS%
-mvn package
-echo "Building installer"
-cd %DHIS2_INSTALL%
-mvn exec:exec

=== removed file 'installers/build.sh'
--- installers/build.sh	2013-04-19 12:35:23 +0000
+++ installers/build.sh	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-#/bin/sh
-export JAVA_HOME=/usr/share/java/jdk1.6.0_19/
-export PATH=$PATH:/home/jason/apache-maven-2.2.1/bin/
-export BITROCK_HOME=/home/jason/installbuilder-6.3.1/
-export BIRT_WAR="/usr/local/apache-tomcat-6.0.18/webapps/"
-export DHIS2_DOCS="/home/jason/dhis2/dhis2-docbook-docs/"
-export DHIS2_SRC="/home/jason/dhis2/dhis2/"
-export MAVEN_OPTS="-Xms256m -Xmx512m"
-
-if [ -z $1 ]
-	then
-	echo "Please provide an option: all, dhis2, installer, docs"
-elif [ -n $1 ]
- 	then
-	OPTIONS=$1
-fi
-case "$OPTIONS" in
-
-all) 
-
-echo "Building DHIS 2 Core..."
-cd $DHIS2_SRC/dhis-2
-mvn clean install -Dtest=skip -DfailIfNoTests=false
-echo "Building DHIS 2 Web..."
-cd $DHIS2_SRC/dhis-2/dhis-web
-mvn clean install -Dtest=skip -DfailIfNoTests=false
-echo "Builidng DHIS2 Live Package"
-cd $DHIS2_SRC/dhis-live/
-mvn clean package -Dtest=skip -DfailIfNoTests=false
-echo "Building documentation"
-cd $DHIS2_DOCS
-mvn package
-echo "Building installer"
-cd $DHIS2_SRC/dhis2-live-installer
-mvn package ;;
-
-docs)
-
-cd $DHIS2_DOCS
-mvn package ;;
-
-live)
-echo "Builidng DHIS2 Live Package"
-cd $DHIS2_SRC/dhis-live/
-mvn clean package -Dtest=skip -DfailIfNoTests=false;;
-
-installer)
-echo "Building installer"
-cd $DHIS2_SRC/dhis2-live-installer
-mvn package ;;
-
-dhis2)
-
-echo "Building DHIS 2 Core..."
-cd $DHIS2_SRC/dhis-2
-mvn clean install -Dtest=skip -DfailIfNoTests=false
-echo "Building DHIS 2 Web..."
-cd $DHIS2_SRC/dhis-2/dhis-web
-mvn clean install -Dtest=skip -DfailIfNoTests=false
-echo "Builidng DHIS2 Live Package"
-cd $DHIS2_SRC/dhis-live/
-mvn clean package -Dtest=skip -DfailIfNoTests=false ;;
-
-esac

=== removed file 'installers/pom.xml'
--- installers/pom.xml	2011-03-10 14:37:48 +0000
+++ installers/pom.xml	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-<project>  
-<modelVersion>4.0.0</modelVersion>
-  <groupId>org.hisp.dhis</groupId>
-  <artifactId>dhis2-installer</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <name>DHIS2 Installer</name>
-  <description>This project will build a set of installers for DHIS2.</description>
-  <packaging>pom</packaging>
-  <url>http://dhis2.com</url>  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.1</version>
-        <executions>
-		  <execution>
-             <id>DHIS 2 Postgresql Windows Installer</id>
-             <phase>package</phase>
-               <configuration>
-                <executable>${env.BITROCK_HOME}</executable>
-                <arguments>
-                <argument>build</argument>
-                <argument>${basedir}/src/bitrock/DHIS2_pginstaller.xml</argument>
-                <argument>windows</argument>
-                </arguments>
-               </configuration>
-             <goals>
-              <goal>exec</goal>
-            </goals>
-          </execution> 
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
-

=== removed directory 'installers/resources'
=== removed directory 'installers/resources/browser'
=== removed directory 'installers/resources/conf'
=== removed directory 'installers/resources/conf/documents'
=== removed directory 'installers/resources/conf/excelreporting'
=== removed directory 'installers/resources/conf/excelreporting/temp'
=== removed file 'installers/resources/conf/generic_hibernate.properties'
--- installers/resources/conf/generic_hibernate.properties	2011-03-18 13:18:45 +0000
+++ installers/resources/conf/generic_hibernate.properties	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-# H2
-
-#hibernate.dialect = org.hisp.dhis.dialect.H2Dialect
-#hibernate.connection.driver_class = org.h2.Driver
-#hibernate.connection.url = jdbc:h2:./database/demo;AUTO_SERVER=TRUE
-#hibernate.connection.username = sa
-#hibernate.connection.password =
-
-# PostgreSQL
-
-hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect
-hibernate.connection.driver_class = org.postgresql.Driver
-hibernate.connection.url = jdbc:postgresql:dhis2db
-hibernate.connection.username = dhis
-hibernate.connection.password = dhis
-
-# MySQL
-
-#hibernate.dialect = org.hibernate.dialect.MySQLDialect
-#hibernate.connection.driver_class = com.mysql.jdbc.Driver
-#hibernate.connection.url = jdbc:mysql://localhost/dhis2
-#hibernate.connection.username = sa
-#hibernate.connection.password = 
-
-# General
-
-hibernate.hbm2ddl.auto = update

=== removed file 'installers/resources/conf/hibernate.properties'
--- installers/resources/conf/hibernate.properties	2011-03-10 14:37:48 +0000
+++ installers/resources/conf/hibernate.properties	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-# H2
-
-#hibernate.dialect = org.hisp.dhis.dialect.H2Dialect
-#hibernate.connection.driver_class = org.h2.Driver
-#hibernate.connection.url = jdbc:h2:./database/demo;AUTO_SERVER=TRUE
-#hibernate.connection.username = sa
-#hibernate.connection.password =
-
-# PostgreSQL
-
-hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect
-hibernate.connection.driver_class = org.postgresql.Driver
-hibernate.connection.url = jdbc:postgresql:DHIS2DBNAME
-hibernate.connection.username = dhis2
-hibernate.connection.password = dhis2
-
-# MySQL
-
-#hibernate.dialect = org.hibernate.dialect.MySQLDialect
-#hibernate.connection.driver_class = com.mysql.jdbc.Driver
-#hibernate.connection.url = jdbc:mysql://localhost/dhis2
-#hibernate.connection.username = sa
-#hibernate.connection.password = 
-
-# General
-
-hibernate.hbm2ddl.auto = update

=== removed directory 'installers/resources/conf/importexport'
=== removed file 'installers/resources/conf/importexport/ibatisConfiguration.xml'
--- installers/resources/conf/importexport/ibatisConfiguration.xml	2010-03-02 06:52:28 +0000
+++ installers/resources/conf/importexport/ibatisConfiguration.xml	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-<configuration>
-  <dataFile>C:\Dhis14\DHIS_#SAMPLE.mdb</dataFile>
-  <userName></userName>
-  <password></password>
-  <levels>8</levels>
-</configuration>
\ No newline at end of file

=== removed file 'installers/resources/conf/jetty.port'
--- installers/resources/conf/jetty.port	2010-03-02 06:52:28 +0000
+++ installers/resources/conf/jetty.port	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-8888

=== removed directory 'installers/resources/conf/reports'
=== removed file 'installers/resources/conf/reports/reportConfiguration.xml'
--- installers/resources/conf/reports/reportConfiguration.xml	2010-03-02 06:52:28 +0000
+++ installers/resources/conf/reports/reportConfiguration.xml	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-<configuration>
-  <home>C:\development\dhis2-lite/webapps/birt</home>
-  <directory>birt</directory>
-</configuration>
\ No newline at end of file

=== removed directory 'installers/resources/conf/rt'
=== removed directory 'installers/resources/conf/rt/design'
=== removed directory 'installers/resources/conf/rt/design/jrxml'
=== removed directory 'installers/resources/conf/rt/design/xml'
=== removed directory 'installers/resources/demodb'
=== removed directory 'installers/resources/dhis-live'
=== removed directory 'installers/resources/docs'
=== removed directory 'installers/resources/files'
=== removed file 'installers/resources/files/Licence.txt'
--- installers/resources/files/Licence.txt	2011-03-06 10:06:56 +0000
+++ installers/resources/files/Licence.txt	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-Copyright (c) 2004-2011, University of Oslo. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met:
-
- o Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-    
- o Redistributions in binary form must reproduce the above copyright notice, 
-   this list of conditions and the following disclaimer in the documentation 
-   and/or other materials provided with the distribution. 
-    
- o Neither the name of the HISP project nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

=== removed file 'installers/resources/files/README.html'
--- installers/resources/files/README.html	2011-03-14 14:10:54 +0000
+++ installers/resources/files/README.html	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-<html>
-<head>
-<style type="text/css">
-	table,td,th
-	{
-		border:1px solid black;
-	}
-
-	th
-	{
-		height:50px;
-	}
-
-	th, td
-	{
-		width:200px;
-		padding:5px;
-	}
-</style>
-</head>
-
-<body>
-<h1>Installing DHIS 2</h1>
-
-<h2><u><i>Important note:</i></u></h2>
-<b>In the resources folder, make sure the following files are present
-before you start the installation:</b><br /><br />
-
-<table>
-	<tr>
-		<th align="left">File</th>
-		<th align="left">Description</th>
-		<th align="left">Source</th>
-	</tr>
-	<tr>
-		<td>dhis2db.zip</td>
-		<td>A zip file that contains a <b>plain text dump</b> of your database.</td>
-		<td>A <b>plain text dump</b> of your database.</td>
-	</tr>
-	<tr>
-		<td>dhis2_user_manual_en.pdf</td>
-		<td>The DHIS 2 user manual</td>
-		<td>Click to download:<br />
-			<a href="http://dhis2.org/doc/snapshot/en/pdf/dhis2_user_manual_en.pdf";>
-				http://dhis2.org/doc/snapshot/en/pdf/dhis2_user_manual_en.pdf</a></td>
-	</tr>
-	<tr>
-		<td>dhis.war</td>
-		<td>The DHIS 2 war file</td>
-		<td>Download the latest release from: <br />
-			<a href="http://dhis2.org/downloads";>
-				http://dhis2.org/downloads</a></td>
-	</tr>
-	<tr>
-		<td>ChromeStandaloneSetup.exe</td>
-		<td>Google Chrome web browser</td>
-		<td>Download the latest release from: <br />
-			<a href="http://www.google.com/chrome/eula.html?standalone=1";>
-				http://www.google.com/chrome/eula.html?standalone=1</a></td>
-	</tr>
-	<tr>
-		<td>jre-&lt;something&gt;.exe</td>
-		<td>Java Runtime Environment</td>
-		<td>Download <b>Windows 7/XP/Vista/2000/2003/2008 <i><u>Offline</u></i></b> from:
-			<a href="http://www.java.com/en/download/manual.jsp";>
-				http://www.java.com/en/download/manual.jsp</a></td>
-	</tr>
-	<tr>
-		<td>postgresql-&lt;something&gt;.exe</td>
-		<td>PostgreSQL database system</td>
-		<td>Download the newest <b>Win x86-<i><u>32</u></i></b> installer from:<br />
-		<a href="http://www.enterprisedb.com/products-services-training/pgdownload#windows";>
-			http://www.enterprisedb.com/products-services-training/pgdownload#windows</a></td>
-	</tr>
-
-</table>
-
-</body>
-</html>

=== removed file 'installers/resources/files/Readme.txt'
--- installers/resources/files/Readme.txt	2011-03-06 10:06:56 +0000
+++ installers/resources/files/Readme.txt	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-Welcome to the DHIS 2!
-
-Thanks for installing DHIS 2. To fully utilize the software, you may need to 
-install a few additional packages.
-
-o A WC3 compliant browser should be installed in order to ensure full compatibility with DHIS 2. 
-- Google Chrome: http://www.google.com/chrome
-- Mozilla: http://www.mozilla.com/
-- Opera: http://www.opera.com/
- 
-o A recent version of Microsoft Office Excel or Open Office Calc 
-(http://www.openoffice.org/) in order to utilize the Excel Report module, 
-or analyze data in PivotTables. 
-o If you want to view the PDF version of the documentation, 
-a recent version of the Adobe Acrobat reader, or other program capable of reading PDF 
-documents. Acrobat Reader can be downloaded free of charge from (http://get.adobe.com/reader/)
-o To find out more about DHIS 2, please visit the DHIS 2 home page at http://www.dhis2.org/
-o Why not join the DHIS 2 users mailing list? Just head over to https://launchpad.net/~dhis2-users.  
-

=== removed file 'installers/resources/files/Readme_generic.txt'
--- installers/resources/files/Readme_generic.txt	2011-03-09 21:57:58 +0000
+++ installers/resources/files/Readme_generic.txt	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-Welcome to the DHIS 2!
-
-Thanks for installing DHIS 2. To fully utilize the software, you may need to 
-install a few additional packages.
-
-o If you want to view the PDF version of the documentation, 
-a recent version of the Adobe Acrobat reader, or other program capable of reading PDF 
-documents. Acrobat Reader can be downloaded free of charge from http://get.adobe.com/reader
-
-o To find out more about DHIS 2, please visit the DHIS 2 home page at http://www.dhis2.org
-
-o Why not join the DHIS 2 users mailing list? Just head over to https://launchpad.net/~dhis2-users.  
-

=== removed directory 'installers/resources/images'
=== removed file 'installers/resources/images/dhis2-logo-blue-rotated.png'
Binary files installers/resources/images/dhis2-logo-blue-rotated.png	2011-03-09 20:21:25 +0000 and installers/resources/images/dhis2-logo-blue-rotated.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'installers/resources/images/dhis2-logo-blue.png'
Binary files installers/resources/images/dhis2-logo-blue.png	2011-03-09 20:21:25 +0000 and installers/resources/images/dhis2-logo-blue.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'installers/resources/images/dhis2-logo-rotated.png'
Binary files installers/resources/images/dhis2-logo-rotated.png	2010-03-02 06:52:28 +0000 and installers/resources/images/dhis2-logo-rotated.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'installers/resources/images/dhis2-logo.png'
Binary files installers/resources/images/dhis2-logo.png	2010-03-02 06:52:28 +0000 and installers/resources/images/dhis2-logo.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'installers/resources/images/dhis2-splash-blue.png'
Binary files installers/resources/images/dhis2-splash-blue.png	2011-03-09 20:21:25 +0000 and installers/resources/images/dhis2-splash-blue.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'installers/resources/images/dhis2.ico'
Binary files installers/resources/images/dhis2.ico	2010-03-02 06:52:28 +0000 and installers/resources/images/dhis2.ico	1970-01-01 00:00:00 +0000 differ
=== removed directory 'installers/resources/jre'
=== removed directory 'installers/resources/postgres'
=== removed file 'installers/resources/postgres/dhis2db.backup'
Binary files installers/resources/postgres/dhis2db.backup	2011-03-06 09:31:18 +0000 and installers/resources/postgres/dhis2db.backup	1970-01-01 00:00:00 +0000 differ
=== removed file 'installers/resources/postgres/restore_db.bat'
--- installers/resources/postgres/restore_db.bat	2011-03-11 10:44:54 +0000
+++ installers/resources/postgres/restore_db.bat	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-SET PGPASSWORD=PG_PASSWORD
-"c:\Program Files\PostgreSQL\9.0\bin\psql.exe" -c "CREATE USER dhis2 CREATEDB LOGIN PASSWORD 'dhis2';" -U postgres -w postgres
-SET PGPASSWORD=dhis2
-"c:\Program Files\Postgresql\9.0\bin\createdb.exe" -U dhis2 -w -O dhis2 DHIS2DBNAME
-"c:\Program Files\Postgresql\9.0\bin\pg_restore" -U dhis2 -w -O dhis2 -d DHIS2DBNAME dhis2db.backup

=== removed file 'installers/resources/postgres/restore_db_psql.bat'
--- installers/resources/postgres/restore_db_psql.bat	2011-03-18 08:51:24 +0000
+++ installers/resources/postgres/restore_db_psql.bat	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-SET PGPASSWORD=postgres
-SET DB_NAME=dhis2db
-SET n=2
-setlocal enabledelayedexpansion
-
-"POSTGRES_INSTALL_LOCATION\bin\psql.exe" -c "CREATE USER dhis CREATEDB LOGIN PASSWORD 'dhis';" -U postgres -w postgres
-
-for %%X in (dhis2db\*.*) do (
-	"POSTGRES_INSTALL_LOCATION\bin\createdb.exe" -U postgres -w -O dhis !DB_NAME!
-	"POSTGRES_INSTALL_LOCATION\bin\psql.exe" -U postgres -w -d !DB_NAME! -f "%%X"
-	SET DB_NAME=%DB_NAME%!n!
-	SET /a n+=1
-)
\ No newline at end of file

=== removed directory 'installers/resources/scripts'
=== removed directory 'installers/resources/scripts/linux'
=== removed file 'installers/resources/scripts/linux/startup.sh'
--- installers/resources/scripts/linux/startup.sh	2010-03-02 06:52:28 +0000
+++ installers/resources/scripts/linux/startup.sh	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-# get ready to catch errors
-trap ctrl-c INT
-trap unexpected-exit ERR
-
-function ctrl-c () {
-    echo
-    echo "============================================"
-    echo "Keyboard interrupt"
-    echo "DHIS2 live exited"
-    echo "============================================"
-    exit
-}
-
-function unexpected-exit () {
-    echo "============================================"
-    echo "DHIS2 live exited with an error"
-    echo "Make sure you have a java runtime in your path"
-    echo "============================================"
-    read -p "Press any key to exit"
-}
-
-echo "Starting DHIS2 live ..."
-# java -jar dhis2-live.jar
-$JAVA_HOME/bin/java  -jar dhis2-live.jar
-echo "DHIS2 live exited normally"
-

=== removed directory 'installers/resources/scripts/win32'
=== removed directory 'installers/resources/webapps'
=== removed directory 'installers/resources/webapps/birt'
=== removed directory 'installers/resources/webapps/dhis'
=== removed directory 'installers/src'
=== removed directory 'installers/src/bitrock'
=== removed file 'installers/src/bitrock/DHIS2.xml'
--- installers/src/bitrock/DHIS2.xml	2010-09-19 07:07:39 +0000
+++ installers/src/bitrock/DHIS2.xml	1970-01-01 00:00:00 +0000
@@ -1,333 +0,0 @@
-<project>
-    <shortName>DHIS2</shortName>
-    <fullName>DHIS2</fullName>
-    <version>2.0.5</version>
-    <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>
-    <allowLanguageSelection>1</allowLanguageSelection>
-    <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>
-

=== removed file 'installers/src/bitrock/DHIS2_demo_birt.xml'
--- installers/src/bitrock/DHIS2_demo_birt.xml	2010-09-19 07:07:39 +0000
+++ installers/src/bitrock/DHIS2_demo_birt.xml	1970-01-01 00:00:00 +0000
@@ -1,319 +0,0 @@
-<project>
-    <shortName>DHIS2</shortName>
-    <fullName>DHIS2</fullName>
-    <version>2.0.5</version>
-    <installerFilename>${product_shortname}-${product_version}-${platform_name}-live-demo.${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>
-    <allowLanguageSelection>1</allowLanguageSelection>
-    <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 component 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/demo.h2.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>
-

=== removed file 'installers/src/bitrock/DHIS2_live.xml'
--- installers/src/bitrock/DHIS2_live.xml	2013-04-19 12:35:23 +0000
+++ installers/src/bitrock/DHIS2_live.xml	1970-01-01 00:00:00 +0000
@@ -1,245 +0,0 @@
-<project>
-    <shortName>DHIS2</shortName>
-    <fullName>DHIS2</fullName>
-    <version>2.0.5</version>
-    <installerFilename>${product_shortname}-${product_version}-${platform_name}-live.${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>
-    <allowLanguageSelection>1</allowLanguageSelection>
-    <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/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>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>
-    </parameterList>
-    <platformOptionsList>
-        <platformOptions>
-            <platform>windows</platform>
-        </platformOptions>
-    </platformOptionsList>
-</project>
-

=== removed file 'installers/src/bitrock/DHIS2_live_embedded_en.xml'
--- installers/src/bitrock/DHIS2_live_embedded_en.xml	2013-04-19 12:35:23 +0000
+++ installers/src/bitrock/DHIS2_live_embedded_en.xml	1970-01-01 00:00:00 +0000
@@ -1,319 +0,0 @@
-<project>
-    <shortName>DHIS2</shortName>
-    <fullName>DHIS2</fullName>
-    <version>2.0.5</version>
-    <installerFilename>${product_shortname}-${product_version}-${platform_name}-live-JRE-en.${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>
-    <allowLanguageSelection>1</allowLanguageSelection>
-    <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/dhis2-live.exe</destination>
-            <origin>${env(DHIS2_SRC)}/dhis-live/target/dhis2-live-embedded.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>
-        <propertiesFileGet>
-            <abortOnError>0</abortOnError>
-            <file>/home/jason/dhis2/dhis2/dhis2-live-installer/resources/installer.properites</file>
-            <key>includedemodb</key>
-            <show>0</show>
-            <showMessageOnError>0</showMessageOnError>
-            <variable>includedemodb</variable>
-        </propertiesFileGet>
-    </preBuildActionList>
-    <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>
-    <postInstallationActionList>
-        <addEnvironmentVariable>
-            <abortOnError>0</abortOnError>
-            <customErrorMessage>The enviornmenr varaible could not be set.</customErrorMessage>
-            <name>DHIS2_BROWSER</name>
-            <scope>user</scope>
-            <value>${installdir}\FirefoxPortable\FirefoxPortable.exe</value>
-        </addEnvironmentVariable>
-    </postInstallationActionList>
-    <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>jre</name>
-            <description>JRE</description>
-            <canBeEdited>0</canBeEdited>
-            <detailedDescription>Embedded JRE</detailedDescription>
-            <selected>1</selected>
-            <show>0</show>
-            <folderList>
-                <folder>
-                    <description>jre</description>
-                    <destination>${installdir}/</destination>
-                    <name>jre</name>
-                    <platforms>windows</platforms>
-                    <distributionFileList>
-                        <distributionDirectory>
-                            <origin>../../resources/jre/jre6</origin>
-                        </distributionDirectory>
-                    </distributionFileList>
-                </folder>
-            </folderList>
-        </component>
-        <component>
-            <name>FirefoxPortable</name>
-            <description>FirefoxPortable</description>
-            <canBeEdited>1</canBeEdited>
-            <selected>1</selected>
-            <show>0</show>
-            <folderList>
-                <folder>
-                    <description>FirefoxPortable</description>
-                    <destination>${installdir}/</destination>
-                    <name>FirefoxPortable</name>
-                    <platforms>windows</platforms>
-                    <distributionFileList>
-                        <distributionDirectory>
-                            <origin>../../resources/browser/FirefoxPortable</origin>
-                        </distributionDirectory>
-                    </distributionFileList>
-                </folder>
-            </folderList>
-            <shouldPackRuleList>
-                <fileExists>
-                    <path>../../resources/browser/FirefoxPortable/FirefoxPortable.exe</path>
-                </fileExists>
-            </shouldPackRuleList>
-        </component>
-        <component>
-            <name>demodb</name>
-            <description>Demo database</description>
-            <canBeEdited>1</canBeEdited>
-            <selected>1</selected>
-            <shouldPackRuleEvaluationLogic>or</shouldPackRuleEvaluationLogic>
-            <show>1</show>
-            <folderList>
-                <folder>
-                    <description>demodb</description>
-                    <destination>${installdir}/database</destination>
-                    <name>demodb</name>
-                    <platforms>all</platforms>
-                    <distributionFileList>
-                        <distributionFile>
-                            <origin>../../resources/demodb/demo.h2.db</origin>
-                        </distributionFile>
-                    </distributionFileList>
-                </folder>
-            </folderList>
-            <shouldPackRuleList>
-                <fileExists>
-                    <path>../../resources/demodb/demo.h2.db</path>
-                </fileExists>
-                <compareText>
-                    <logic>equals</logic>
-                    <text>${includedemodb}</text>
-                    <value>1</value>
-                </compareText>
-            </shouldPackRuleList>
-        </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>
-    </parameterList>
-    <platformOptionsList>
-        <platformOptions>
-            <platform>windows</platform>
-        </platformOptions>
-    </platformOptionsList>
-</project>
-

=== removed file 'installers/src/bitrock/DHIS2_live_embedded_fr.xml'
--- installers/src/bitrock/DHIS2_live_embedded_fr.xml	2010-09-18 21:34:20 +0000
+++ installers/src/bitrock/DHIS2_live_embedded_fr.xml	1970-01-01 00:00:00 +0000
@@ -1,296 +0,0 @@
-<project>
-    <shortName>DHIS2</shortName>
-    <fullName>DHIS2</fullName>
-    <version>2.0.5</version>
-    <installerFilename>${product_shortname}-${product_version}-${platform_name}-live-JRE-fr.${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>
-    <defaultLanguage>fr</defaultLanguage>
-    <allowLanguageSelection>1</allowLanguageSelection>
-    <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-with-dependencies.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-embedded.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>
-    <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>
-    <postInstallationActionList>
-        <addEnvironmentVariable>
-            <abortOnError>0</abortOnError>
-            <customErrorMessage>The enviornmenr varaible could not be set.</customErrorMessage>
-            <name>DHIS2_BROWSER</name>
-            <scope>user</scope>
-            <value>${installdir}\FirefoxPortable\FirefoxPortable.exe</value>
-        </addEnvironmentVariable>
-    </postInstallationActionList>
-    <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-with-dependencies.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>jre</name>
-            <description>JRE</description>
-            <canBeEdited>0</canBeEdited>
-            <detailedDescription>Embedded JRE</detailedDescription>
-            <selected>1</selected>
-            <show>0</show>
-            <folderList>
-                <folder>
-                    <description>jre</description>
-                    <destination>${installdir}/</destination>
-                    <name>jre</name>
-                    <platforms>windows</platforms>
-                    <distributionFileList>
-                        <distributionDirectory>
-                            <origin>../../resources/jre/jre6</origin>
-                        </distributionDirectory>
-                    </distributionFileList>
-                </folder>
-            </folderList>
-        </component>
-        <component>
-            <name>FirefoxPortable</name>
-            <description>FirefoxPortable</description>
-            <canBeEdited>1</canBeEdited>
-            <selected>1</selected>
-            <show>0</show>
-            <folderList>
-                <folder>
-                    <description>FirefoxPortable</description>
-                    <destination>${installdir}/</destination>
-                    <name>FirefoxPortable</name>
-                    <platforms>windows</platforms>
-                    <distributionFileList>
-                        <distributionDirectory>
-                            <origin>../../resources/browser/FirefoxPortable</origin>
-                        </distributionDirectory>
-                    </distributionFileList>
-                </folder>
-            </folderList>
-        </component>
-		<component>
-            <name>demodb</name>
-            <description>Demo database</description>
-            <canBeEdited>1</canBeEdited>
-            <selected>1</selected>
-            <show>1</show>
-            <folderList>
-                <folder>
-                    <description>demodb</description>
-                    <destination>${installdir}/database</destination>
-                    <name>demodb</name>
-                    <platforms>all</platforms>
-                    <distributionFileList>
-                        <distributionFile>
-                            <origin>../../resources/demodb/demo.h2.db</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>
-    </parameterList>
-    <platformOptionsList>
-        <platformOptions>
-            <platform>windows</platform>
-        </platformOptions>
-    </platformOptionsList>
-</project>
-

=== removed file 'installers/src/bitrock/DHIS2_pg.xml'
--- installers/src/bitrock/DHIS2_pg.xml	2013-04-19 12:35:23 +0000
+++ installers/src/bitrock/DHIS2_pg.xml	1970-01-01 00:00:00 +0000
@@ -1,419 +0,0 @@
-<project>
-    <shortName>DHIS2</shortName>
-    <fullName>DHIS2</fullName>
-    <version>2.0.5</version>
-    <installerFilename>${product_shortname}-${product_version}-${platform_name}-live-postgresql.${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>
-

=== removed file 'installers/src/bitrock/DHIS2_pginstaller.xml'
--- installers/src/bitrock/DHIS2_pginstaller.xml	2011-03-11 14:41:52 +0000
+++ installers/src/bitrock/DHIS2_pginstaller.xml	1970-01-01 00:00:00 +0000
@@ -1,460 +0,0 @@
-<project>
-    <shortName>DHIS2</shortName>
-    <fullName>DHIS2</fullName>
-    <version>2.1</version>
-    <installerFilename>${product_shortname}-${product_version}-${platform_name}-live-JRE-en.${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>
-    <allowLanguageSelection>1</allowLanguageSelection>
-    <initializationActionList>
-        <autodetectJava>
-            <abortOnError>0</abortOnError>
-            <promptUser>0</promptUser>
-            <showMessageOnError>0</showMessageOnError>
-            <validVersionList>
-                <validVersion>
-                    <maxVersion></maxVersion>
-                    <minVersion>1.6.0_18</minVersion>
-                    <requireJDK>0</requireJDK>
-                    <vendor></vendor>
-                </validVersion>
-            </validVersionList>
-        </autodetectJava>
-    </initializationActionList>
-    <readyToInstallActionList>
-        <createDirectory>
-            <path>${installdir}/database</path>
-            <progressText>Creating database directory.</progressText>
-        </createDirectory>
-        <createDirectory>
-            <path>${installdir}/log</path>
-        </createDirectory>
-        <createDirectory>
-            <path>${installdir}/webapps</path>
-        </createDirectory>
-        <createDirectory>
-            <explanation>Creating temporary directory</explanation>
-            <path>${installdir}\tmp\</path>
-        </createDirectory>
-    </readyToInstallActionList>
-    <postUninstallationActionList>
-        <deleteFile>
-            <path>${installdir}</path>
-        </deleteFile>
-    </postUninstallationActionList>
-    <allowComponentSelection>1</allowComponentSelection>
-    <compressionAlgorithm>lzma</compressionAlgorithm>
-    <enableRollback>1</enableRollback>
-    <enableTimestamp>1</enableTimestamp>
-    <requestedExecutionLevel>highestAvailable</requestedExecutionLevel>
-    <requireInstallationByRootUser>1</requireInstallationByRootUser>
-    <saveRelativePaths>1</saveRelativePaths>
-    <vendor>DHIS2</vendor>
-    <componentList>
-        <component>
-            <name>jre</name>
-            <description>JRE</description>
-            <canBeEdited>0</canBeEdited>
-            <selected>1</selected>
-            <show>1</show>
-            <folderList>
-                <folder>
-                    <description>JRE</description>
-                    <destination>${installdir}\tmp\</destination>
-                    <name>JRE</name>
-                    <platforms>windows</platforms>
-                    <distributionFileList>
-                        <distributionFile>
-                            <origin>../../resources/jre/jre-6u24-windows-i586-s.exe</origin>
-                        </distributionFile>
-                    </distributionFileList>
-                </folder>
-            </folderList>
-            <postInstallationActionList>
-                <runProgram>
-                    <abortOnError>0</abortOnError>
-                    <explanation>Installing Java Runtime Enviornment</explanation>
-                    <program>jre-6u24-windows-i586-s.exe</program>
-                    <programArguments>/s /v /log javainstall.txt </programArguments>
-                    <progressText>Installing Java Runtime Enviornment</progressText>
-                    <showMessageOnError>0</showMessageOnError>
-                    <useMSDOSPath>0</useMSDOSPath>
-                    <workingDirectory>${installdir}\tmp\</workingDirectory>
-                    <onErrorActionList>
-                        <showQuestion>
-                            <default>yes</default>
-                            <text>Java was unable to be installed. Do you wish to try and install it manually?</text>
-                            <variable>${java_gui_install}</variable>
-                        </showQuestion>
-                        <runConsoleProgram>
-                            <program>jre-6u24-windows-i586-s.exe</program>
-                            <programArguments></programArguments>
-                            <useMSDOSPath>0</useMSDOSPath>
-                            <workingDirectory>${installdir}\tmp\</workingDirectory>
-                            <ruleList>
-                                <compareValues>
-                                    <logic>equals</logic>
-                                    <value1>${java_gui_install}</value1>
-                                    <value2>1</value2>
-                                </compareValues>
-                            </ruleList>
-                        </runConsoleProgram>
-                    </onErrorActionList>
-                    <ruleList>
-                        <compareValues>
-                            <logic>equals</logic>
-                            <value1>${java_autodetected}</value1>
-                            <value2>0</value2>
-                        </compareValues>
-                    </ruleList>
-                </runProgram>
-                <exit>
-                    <ruleList>
-                        <compareValues>
-                            <logic>equals</logic>
-                            <value1>${proceed_without_java}</value1>
-                            <value2>0</value2>
-                        </compareValues>
-                    </ruleList>
-                </exit>
-            </postInstallationActionList>
-        </component>
-        <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>../../../dhis-live/target/dhis2-live-jar-with-dependencies.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>
-                            <runAsAdmin>0</runAsAdmin>
-                            <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>
-                </folder>
-                <folder>
-                    <description>Program Files</description>
-                    <destination>${installdir}</destination>
-                    <name>programfileswindows</name>
-                    <platforms>windows</platforms>
-                    <distributionFileList>
-                        <distributionFile>
-                            <origin>../../../dhis-live/target/dhis2-live.exe</origin>
-                        </distributionFile>
-                    </distributionFileList>
-                </folder>
-                <folder>
-                    <description>Program Files</description>
-                    <destination>${installdir}</destination>
-                    <name>programfilesosx</name>
-                    <platforms>osx</platforms>
-                </folder>
-            </folderList>
-            <postInstallationActionList>
-                <renameFile>
-                    <destination>${installdir}/dhis2-live.jar</destination>
-                    <origin>${installdir}/dhis2-live-jar-with-dependencies.jar</origin>
-                </renameFile>
-            </postInstallationActionList>
-            <startMenuShortcutList>
-                <startMenuShortcut>
-                    <comment>Uninstall ${product_fullname}</comment>
-                    <name>Uninstall ${product_fullname}</name>
-                    <runAsAdmin>0</runAsAdmin>
-                    <runInTerminal>0</runInTerminal>
-                    <windowsExec>${installdir}/${uninstallerName}.exe</windowsExec>
-                    <windowsExecArgs></windowsExecArgs>
-                    <windowsIcon></windowsIcon>
-                    <windowsPath>${installdir}/</windowsPath>
-                </startMenuShortcut>
-                <startMenuShortcut>
-                    <comment>Start DHIS 2</comment>
-                    <name>Start DHIS 2</name>
-                    <runAsAdmin>0</runAsAdmin>
-                    <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>
-                    <runAsAdmin>0</runAsAdmin>
-                    <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>../../../dhis-2/dhis-web/dhis-web-portal/target/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>../../../dhis2-docbook-docs/target/docbkx/pdf/dhis2_user_manual_en.pdf</origin>
-                        </distributionFile>
-                    </distributionFileList>
-                </folder>
-            </folderList>
-        </component>
-        <component>
-            <name>postgres</name>
-            <description>Postgresql 9.0</description>
-            <canBeEdited>1</canBeEdited>
-            <detailedDescription>Postgresql Database system</detailedDescription>
-            <selected>1</selected>
-            <show>1</show>
-            <folderList>
-                <folder>
-                    <description>postgres</description>
-                    <destination>${installdir}\tmp\</destination>
-                    <name>postgres</name>
-                    <platforms>windows</platforms>
-                    <distributionFileList>
-                        <distributionFile>
-                            <origin>../../resources/postgres/postgresql-9.0.1-1-windows.exe</origin>
-                        </distributionFile>
-                    </distributionFileList>
-                </folder>
-            </folderList>
-            <initializationActionList>
-                <setInstallerVariable>
-                    <name>${postgres_overwrite|</name>
-                    <value>1</value>
-                </setInstallerVariable>
-            </initializationActionList>
-            <parameterList>
-                <booleanParameter>
-                    <name>postgres_overwrite</name>
-                    <title>Overwrite Postgresql</title>
-                    <description>An existing Postgresql installation has been detected. Are you sure you want to overwrite this instance?</description>
-                    <explanation></explanation>
-                    <value></value>
-                    <default>1</default>
-                    <displayStyle>radiobuttons</displayStyle>
-                    <ruleList>
-                        <registryTest>
-                            <key>HKEY_LOCAL_MACHINE\SOFTWARE\PostgreSQL\Installations\postgresql*</key>
-                            <logic>exists</logic>
-                            <name></name>
-                        </registryTest>
-                    </ruleList>
-                </booleanParameter>
-            </parameterList>
-            <postInstallationActionList>
-                <runProgram>
-                    <explanation>Installing Postgresql</explanation>
-                    <program>postgresql-9.0.1-1-windows.exe</program>
-                    <programArguments>--unattendedmodeui none --mode unattended --superaccount postgres --servicepassword ${pg_password} --superpassword ${pg_password}</programArguments>
-                    <progressText>Installing Postgresql</progressText>
-                    <useMSDOSPath>0</useMSDOSPath>
-                    <workingDirectory>${installdir}\tmp\</workingDirectory>
-                    <ruleList>
-                        <compareValues>
-                            <logic>equals</logic>
-                            <value1>${postgres_overwrite}</value1>
-                            <value2>1</value2>
-                        </compareValues>
-                    </ruleList>
-                </runProgram>
-            </postInstallationActionList>
-        </component>
-        <component>
-            <name>dhis2db</name>
-            <description>DHIS2 database</description>
-            <canBeEdited>1</canBeEdited>
-            <detailedDescription>DHIS2 Database</detailedDescription>
-            <selected>1</selected>
-            <show>1</show>
-            <folderList>
-                <folder>
-                    <destination>${installdir}\tmp\</destination>
-                    <name>newfolder</name>
-                    <platforms>windows</platforms>
-                    <distributionFileList>
-                        <distributionFile>
-                            <origin>../../resources/postgres/dhis2db.backup</origin>
-                        </distributionFile>
-                        <distributionFile>
-                            <origin>../../resources/postgres/restore_db.bat</origin>
-                        </distributionFile>
-                    </distributionFileList>
-                </folder>
-            </folderList>
-            <parameterList>
-                <passwordParameter>
-                    <name>pg_password</name>
-                    <title>Postgresql Password</title>
-                    <description>Please enter a password for the Postgresql superuser.</description>
-                    <explanation></explanation>
-                    <value></value>
-                    <default>postgres</default>
-                    <allowEmptyValue>0</allowEmptyValue>
-                    <askForConfirmation>0</askForConfirmation>
-                    <descriptionRetype></descriptionRetype>
-                    <width>20</width>
-                </passwordParameter>
-                <stringParameter>
-                    <name>dbname</name>
-                    <title>DHIS2 Database</title>
-                    <description>Please provide the name of the database for DHIS2.</description>
-                    <explanation></explanation>
-                    <value></value>
-                    <default>dhis2db</default>
-                    <allowEmptyValue>0</allowEmptyValue>
-                    <width>40</width>
-                </stringParameter>
-            </parameterList>
-            <postInstallationActionList>
-                <substitute>
-                    <files>${installdir}\tmp\restore_db.bat</files>
-                    <type>regexp</type>
-                    <substitutionList>
-                        <substitution>
-                            <pattern>PG_PASSWORD</pattern>
-                            <value>${pg_password}</value>
-                        </substitution>
-                        <substitution>
-                            <pattern>DHIS2DBNAME</pattern>
-                            <value>${dbname}</value>
-                        </substitution>
-                    </substitutionList>
-                </substitute>
-                <substitute>
-                    <files>${installdir}\conf\hibernate.properties</files>
-                    <type>regexp</type>
-                    <substitutionList>
-                        <substitution>
-                            <pattern>DHIS2DBNAME</pattern>
-                            <value>${dbname}</value>
-                        </substitution>
-                    </substitutionList>
-                </substitute>
-                <runProgram>
-                    <abortOnError>0</abortOnError>
-                    <explanation>Restoring DHIS2 Database</explanation>
-                    <program>restore_db.bat</program>
-                    <programArguments></programArguments>
-                    <progressText>Please be patient. Restoring DB.</progressText>
-                    <showMessageOnError>0</showMessageOnError>
-                    <workingDirectory>${installdir}\tmp\</workingDirectory>
-                </runProgram>
-                <deleteFile>
-                    <path>${installdir}\tmp\dhis2db.backup</path>
-                </deleteFile>
-                <deleteFile>
-                    <path>${installdir}\tmp\restore_db.bat</path>
-                </deleteFile>
-            </postInstallationActionList>
-        </component>
-    </componentList>
-    <finalPageActionList>
-        <deleteFile>
-            <abortOnError>0</abortOnError>
-            <explanation>Delete temporary files</explanation>
-            <path>${installdir}\tmp\postgresql-9.0.1-1-windows.exe</path>
-        </deleteFile>
-        <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>
-    </parameterList>
-    <platformOptionsList>
-        <platformOptions>
-            <platform>windows</platform>
-        </platformOptions>
-    </platformOptionsList>
-</project>
-

=== removed file 'installers/src/bitrock/DHIS2_pginstaller_generic.xml'
--- installers/src/bitrock/DHIS2_pginstaller_generic.xml	2011-03-22 14:24:37 +0000
+++ installers/src/bitrock/DHIS2_pginstaller_generic.xml	1970-01-01 00:00:00 +0000
@@ -1,807 +0,0 @@
-<project>
-    <shortName>DHIS2</shortName>
-    <fullName>DHIS2</fullName>
-    <version>2.1</version>
-    <installerFilename>${product_shortname}-${product_version}-${platform_name}-live-generic-en.${platform_exec_suffix}</installerFilename>
-    <readmeFile>../../resources/files/Readme_generic.txt</readmeFile>
-    <licenseFile>../../resources/files/Licence.txt</licenseFile>
-    <leftImage>../../resources/images/dhis2-logo-blue-rotated.png</leftImage>
-    <logoImage>../../resources/images/dhis2-logo-blue.png</logoImage>
-    <splashImage>../../resources/images/dhis2-splash-blue.png</splashImage>
-    <allowLanguageSelection>1</allowLanguageSelection>
-    <initializationActionList>
-        <setInstallerVariable>
-            <name>resourcesWarningIsShown</name>
-            <value>true</value>
-            <ruleList>
-                <fileExists>
-                    <negate>1</negate>
-                    <path>${installer_directory}\resources</path>
-                </fileExists>
-            </ruleList>
-        </setInstallerVariable>
-        <showWarning>
-            <text>Cannot find the resources folder. Make sure it exists alongside the installer (The installer is NOT supposed to be inside the resources folder). If the folder is still not found, the installation process will be aborted.</text>
-            <title>resources folder is missing</title>
-            <ruleList>
-                <fileExists>
-                    <negate>1</negate>
-                    <path>${installer_directory}\resources</path>
-                </fileExists>
-            </ruleList>
-        </showWarning>
-        <throwError>
-            <customErrorMessage>Could not find the resources folder.</customErrorMessage>
-            <text>Could not find the resources folder.</text>
-            <ruleList>
-                <fileExists>
-                    <negate>1</negate>
-                    <path>${installer_directory}\resources</path>
-                </fileExists>
-            </ruleList>
-        </throwError>
-        <showInfo>
-            <text>Thank you! The resources folder was located. The installation process will continue.</text>
-            <title>Thank you!</title>
-            <ruleList>
-                <fileExists>
-                    <path>${installer_directory}\resources</path>
-                </fileExists>
-                <isTrue>
-                    <value>${resourcesWarningIsShown}</value>
-                </isTrue>
-            </ruleList>
-        </showInfo>
-        <registryFind>
-            <dataPattern>Java(TM)*6*</dataPattern>
-            <keyPattern>*</keyPattern>
-            <namePattern>*</namePattern>
-            <rootKey>HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall</rootKey>
-            <searchDepth>1</searchDepth>
-            <variable>jreInstalled</variable>
-            <wowMode>64</wowMode>
-        </registryFind>
-        <registryFind>
-            <dataPattern>Java(TM)*6*</dataPattern>
-            <keyPattern>*</keyPattern>
-            <namePattern>*</namePattern>
-            <rootKey>HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall</rootKey>
-            <searchDepth>1</searchDepth>
-            <variable>jreInstalled</variable>
-            <wowMode>32</wowMode>
-            <ruleList>
-                <compareTextLength>
-                    <length>1</length>
-                    <logic>less</logic>
-                    <text>${jreInstalled}</text>
-                </compareTextLength>
-            </ruleList>
-        </registryFind>
-        <registryFind>
-            <dataPattern>PostgreSQL 9*</dataPattern>
-            <keyPattern>*</keyPattern>
-            <namePattern>*</namePattern>
-            <rootKey>HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall</rootKey>
-            <searchDepth>1</searchDepth>
-            <variable>postgresInstalled</variable>
-            <wowMode>64</wowMode>
-        </registryFind>
-        <registryFind>
-            <dataPattern>PostgreSQL 9*</dataPattern>
-            <keyPattern>*</keyPattern>
-            <namePattern>*</namePattern>
-            <rootKey>HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall</rootKey>
-            <searchDepth>1</searchDepth>
-            <variable>postgresInstalled</variable>
-            <wowMode>32</wowMode>
-            <ruleList>
-                <compareTextLength>
-                    <length>1</length>
-                    <logic>less</logic>
-                    <text>${postgresInstalled}</text>
-                </compareTextLength>
-            </ruleList>
-        </registryFind>
-        <registryFind>
-            <dataPattern>Google Chrome</dataPattern>
-            <keyPattern>*</keyPattern>
-            <namePattern>DisplayName</namePattern>
-            <rootKey>HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Uninstall</rootKey>
-            <searchDepth>1</searchDepth>
-            <variable>chromeInstalled</variable>
-            <wowMode>64</wowMode>
-        </registryFind>
-        <registryFind>
-            <dataPattern>Google Chrome</dataPattern>
-            <keyPattern>*</keyPattern>
-            <namePattern>DisplayName</namePattern>
-            <rootKey>HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Uninstall</rootKey>
-            <searchDepth>1</searchDepth>
-            <variable>chromeInstalled</variable>
-            <wowMode>32</wowMode>
-            <ruleList>
-                <compareTextLength>
-                    <length>1</length>
-                    <logic>less</logic>
-                    <text>${chromeInstalled}</text>
-                </compareTextLength>
-            </ruleList>
-        </registryFind>
-        <componentSelection>
-            <deselect></deselect>
-            <select>Java</select>
-            <ruleList>
-                <compareTextLength>
-                    <length>1</length>
-                    <logic>less</logic>
-                    <text>${jreInstalled}</text>
-                </compareTextLength>
-            </ruleList>
-        </componentSelection>
-        <componentSelection>
-            <deselect></deselect>
-            <select>postgres</select>
-            <ruleList>
-                <compareTextLength>
-                    <length>1</length>
-                    <logic>less</logic>
-                    <text>${postgresInstalled}</text>
-                </compareTextLength>
-            </ruleList>
-        </componentSelection>
-        <componentSelection>
-            <deselect></deselect>
-            <select>Chrome</select>
-            <ruleList>
-                <compareTextLength>
-                    <length>1</length>
-                    <logic>less</logic>
-                    <text>${chromeInstalled}</text>
-                </compareTextLength>
-            </ruleList>
-        </componentSelection>
-    </initializationActionList>
-    <readyToInstallActionList>
-        <createDirectory>
-            <path>${installdir}/database</path>
-            <progressText>Creating database directory.</progressText>
-        </createDirectory>
-        <createDirectory>
-            <path>${installdir}/log</path>
-        </createDirectory>
-        <createDirectory>
-            <path>${installdir}/webapps</path>
-        </createDirectory>
-        <createDirectory>
-            <explanation>Creating temporary directory</explanation>
-            <path>${installdir}/tmp</path>
-        </createDirectory>
-    </readyToInstallActionList>
-    <postInstallationActionList>
-        <deleteFile>
-            <path>${installdir}\tmp</path>
-        </deleteFile>
-    </postInstallationActionList>
-    <postUninstallationActionList>
-        <deleteFile>
-            <path>${installdir}</path>
-        </deleteFile>
-    </postUninstallationActionList>
-    <allowComponentSelection>1</allowComponentSelection>
-    <compressionAlgorithm>lzma</compressionAlgorithm>
-    <enableRollback>1</enableRollback>
-    <enableTimestamp>1</enableTimestamp>
-    <requestedExecutionLevel>highestAvailable</requestedExecutionLevel>
-    <requireInstallationByRootUser>1</requireInstallationByRootUser>
-    <saveRelativePaths>1</saveRelativePaths>
-    <vendor>DHIS2</vendor>
-    <componentList>
-        <component>
-            <name>dhis2live</name>
-            <description>DHIS2 Live</description>
-            <canBeEdited>0</canBeEdited>
-            <selected>1</selected>
-            <show>1</show>
-            <desktopShortcutList>
-                <shortcut>
-                    <comment>Start DHIS 2</comment>
-                    <exec></exec>
-                    <icon></icon>
-                    <name>DHIS 2</name>
-                    <path></path>
-                    <platforms>windows</platforms>
-                    <runAsAdmin>0</runAsAdmin>
-                    <runInTerminal>0</runInTerminal>
-                    <windowsExec>${installdir}/dhis2-live.exe</windowsExec>
-                    <windowsExecArgs></windowsExecArgs>
-                    <windowsIcon></windowsIcon>
-                    <windowsPath></windowsPath>
-                </shortcut>
-            </desktopShortcutList>
-            <folderList>
-                <folder>
-                    <description>Program Files</description>
-                    <destination>${installdir}</destination>
-                    <name>programfiles</name>
-                    <platforms>all</platforms>
-                    <distributionFileList>
-                        <distributionDirectory>
-                            <origin>../../resources/conf</origin>
-                        </distributionDirectory>
-                        <distributionFile>
-                            <origin>../../../dhis-live/target/dhis2-live-jar-with-dependencies.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>
-                            <runAsAdmin>0</runAsAdmin>
-                            <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>
-                </folder>
-                <folder>
-                    <description>Program Files</description>
-                    <destination>${installdir}</destination>
-                    <name>programfileswindows</name>
-                    <platforms>windows</platforms>
-                    <distributionFileList>
-                        <distributionFile>
-                            <origin>../../../dhis-live/target/dhis2-live.exe</origin>
-                        </distributionFile>
-                    </distributionFileList>
-                </folder>
-                <folder>
-                    <description>Program Files</description>
-                    <destination>${installdir}</destination>
-                    <name>programfilesosx</name>
-                    <platforms>osx</platforms>
-                </folder>
-            </folderList>
-            <postInstallationActionList>
-                <renameFile>
-                    <destination>${installdir}/dhis2-live.jar</destination>
-                    <origin>${installdir}/dhis2-live-jar-with-dependencies.jar</origin>
-                </renameFile>
-                <deleteFile>
-                    <path>${installdir}/conf/hibernate.properties</path>
-                </deleteFile>
-                <renameFile>
-                    <destination>${installdir}/conf/hibernate.properties</destination>
-                    <origin>${installdir}/conf/generic_hibernate.properties</origin>
-                </renameFile>
-            </postInstallationActionList>
-            <startMenuShortcutList>
-                <startMenuShortcut>
-                    <comment>Uninstall ${product_fullname}</comment>
-                    <name>Uninstall ${product_fullname}</name>
-                    <runAsAdmin>0</runAsAdmin>
-                    <runInTerminal>0</runInTerminal>
-                    <windowsExec>${installdir}/${uninstallerName}.exe</windowsExec>
-                    <windowsExecArgs></windowsExecArgs>
-                    <windowsIcon></windowsIcon>
-                    <windowsPath>${installdir}/</windowsPath>
-                </startMenuShortcut>
-                <startMenuShortcut>
-                    <comment>Start DHIS 2</comment>
-                    <name>Start DHIS 2</name>
-                    <runAsAdmin>0</runAsAdmin>
-                    <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>
-                    <runAsAdmin>0</runAsAdmin>
-                    <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>
-            <postInstallationActionList>
-                <createDirectory>
-                    <path>${installdir}\webapps\dhis</path>
-                </createDirectory>
-                <unzip>
-                    <destinationDirectory>${installdir}\webapps\dhis</destinationDirectory>
-                    <explanation>Extracting the dhis.war file to the installer directory</explanation>
-                    <progressText>Copying DHIS 2 files</progressText>
-                    <zipFile>${installer_directory}\resources\dhis.war</zipFile>
-                </unzip>
-            </postInstallationActionList>
-            <preInstallationActionList>
-                <setInstallerVariable>
-                    <name>coreWarningIsShown</name>
-                    <value>true</value>
-                    <ruleList>
-                        <fileExists>
-                            <negate>1</negate>
-                            <path>${installer_directory}\resources\dhis.war</path>
-                        </fileExists>
-                    </ruleList>
-                </setInstallerVariable>
-                <showWarning>
-                    <text>Cannot find dhis.war in the resources folder. Place it there and press OK. If it is still not found, the installation process will be aborted.</text>
-                    <title>dhis.war is missing</title>
-                    <ruleList>
-                        <fileExists>
-                            <negate>1</negate>
-                            <path>${installer_directory}\resources\dhis.war</path>
-                        </fileExists>
-                    </ruleList>
-                </showWarning>
-                <throwError>
-                    <customErrorMessage>Could not find dhis.war in the resources folder.</customErrorMessage>
-                    <text>Could not find dhis.war in the resources folder.</text>
-                    <ruleList>
-                        <fileExists>
-                            <negate>1</negate>
-                            <path>${installer_directory}\resources\dhis.war</path>
-                        </fileExists>
-                    </ruleList>
-                </throwError>
-                <showInfo>
-                    <text>Thank you! dhis.war was located. The installation process will continue.</text>
-                    <title>Thank you!</title>
-                    <ruleList>
-                        <fileExists>
-                            <path>${installer_directory}\resources\dhis.war</path>
-                        </fileExists>
-                        <isTrue>
-                            <value>${coreWarningIsShown}</value>
-                        </isTrue>
-                    </ruleList>
-                </showInfo>
-            </preInstallationActionList>
-        </component>
-        <component>
-            <name>Java</name>
-            <description>Java</description>
-            <canBeEdited>1</canBeEdited>
-            <selected>0</selected>
-            <show>1</show>
-            <postInstallationActionList>
-                <runProgram>
-                    <explanation>Installing Java Runtime Environment</explanation>
-                    <program>jre*.exe</program>
-                    <programArguments>/s /v</programArguments>
-                    <progressText>Installing Java</progressText>
-                    <workingDirectory>${installer_directory}\resources</workingDirectory>
-                </runProgram>
-            </postInstallationActionList>
-            <readyToInstallActionList>
-                <setInstallerVariable>
-                    <name>jreWarningIsShown</name>
-                    <value>true</value>
-                    <ruleList>
-                        <fileExists>
-                            <negate>1</negate>
-                            <path>${installer_directory}\resources\jre*.exe</path>
-                        </fileExists>
-                    </ruleList>
-                </setInstallerVariable>
-                <showWarning>
-                    <text>Cannot find jre*.exe in the resources folder. Place it there and press OK. If it is still not found, the installation process will be aborted.</text>
-                    <title>JRE is missing</title>
-                    <ruleList>
-                        <fileExists>
-                            <negate>1</negate>
-                            <path>${installer_directory}\resources\jre*.exe</path>
-                        </fileExists>
-                    </ruleList>
-                </showWarning>
-                <throwError>
-                    <customErrorMessage>Could not find jre*.exe in the resources folder.</customErrorMessage>
-                    <text>Could not find jre*.exe in the resources folder.</text>
-                    <ruleList>
-                        <fileExists>
-                            <negate>1</negate>
-                            <path>${installer_directory}\resources\jre*.exe</path>
-                        </fileExists>
-                    </ruleList>
-                </throwError>
-                <showInfo>
-                    <text>Thank you! The JRE file was located. The installation process will continue.</text>
-                    <title>Thank you!</title>
-                    <ruleList>
-                        <fileExists>
-                            <path>${installer_directory}\resources\jre*.exe</path>
-                        </fileExists>
-                        <isTrue>
-                            <value>${jreWarningIsShown}</value>
-                        </isTrue>
-                    </ruleList>
-                </showInfo>
-            </readyToInstallActionList>
-        </component>
-        <component>
-            <name>postgres</name>
-            <description>Postgres</description>
-            <canBeEdited>1</canBeEdited>
-            <selected>0</selected>
-            <show>1</show>
-            <parameterList>
-                <passwordParameter>
-                    <name>pg_password</name>
-                    <title>Postgresql Password</title>
-                    <description>Please enter a password for the Postgresql superuser.</description>
-                    <explanation></explanation>
-                    <value></value>
-                    <default>postgres</default>
-                    <allowEmptyValue>0</allowEmptyValue>
-                    <askForConfirmation>0</askForConfirmation>
-                    <descriptionRetype></descriptionRetype>
-                    <width>20</width>
-                </passwordParameter>
-            </parameterList>
-            <postInstallationActionList>
-                <substitute>
-                    <files>${installdir}\tmp\restore_db_psql.bat</files>
-                    <type>regexp</type>
-                    <substitutionList>
-                        <substitution>
-                            <pattern>PG_PASSWORD</pattern>
-                            <value>${pg_password}</value>
-                        </substitution>
-                    </substitutionList>
-                </substitute>
-                <runProgram>
-                    <explanation>Installing PostgreSQL</explanation>
-                    <program>postgresql*.exe</program>
-                    <programArguments>--unattendedmodeui none --mode unattended --superaccount postgres --servicepassword postgres --superpassword postgres</programArguments>
-                    <progressText>Installing Postgres</progressText>
-                    <workingDirectory>${installer_directory}\resources</workingDirectory>
-                </runProgram>
-            </postInstallationActionList>
-            <readyToInstallActionList>
-                <setInstallerVariable>
-                    <name>postgresWarningIsShown</name>
-                    <value>true</value>
-                    <ruleList>
-                        <fileExists>
-                            <negate>1</negate>
-                            <path>${installer_directory}\resources\postgresql*.exe</path>
-                        </fileExists>
-                    </ruleList>
-                </setInstallerVariable>
-                <showWarning>
-                    <text>Cannot find postgresql*.exe in the resources folder. Place it there and press OK. If it is still not found, the installation process will be aborted.</text>
-                    <title>postgresql*.exe is missing</title>
-                    <ruleList>
-                        <fileExists>
-                            <negate>1</negate>
-                            <path>${installer_directory}\resources\postgresql*.exe</path>
-                        </fileExists>
-                    </ruleList>
-                </showWarning>
-                <throwError>
-                    <customErrorMessage>Could not find postgresql*.exe in the resources folder.</customErrorMessage>
-                    <text>Could not find postgresql*.exe in the resources folder.</text>
-                    <ruleList>
-                        <fileExists>
-                            <negate>1</negate>
-                            <path>${installer_directory}\resources\postgresql*.exe</path>
-                        </fileExists>
-                    </ruleList>
-                </throwError>
-                <showInfo>
-                    <text>Thank you! The PostgreSQL setup file was located. The installation process will continue.</text>
-                    <title>Thank you!</title>
-                    <ruleList>
-                        <fileExists>
-                            <path>${installer_directory}\resources\postgresql*.exe</path>
-                        </fileExists>
-                        <isTrue>
-                            <value>${postgresWarningIsShown}</value>
-                        </isTrue>
-                    </ruleList>
-                </showInfo>
-            </readyToInstallActionList>
-        </component>
-        <component>
-            <name>dhis2db</name>
-            <description>DHIS2 database</description>
-            <canBeEdited>1</canBeEdited>
-            <detailedDescription>DHIS2 Database</detailedDescription>
-            <selected>1</selected>
-            <show>1</show>
-            <folderList>
-                <folder>
-                    <destination>${installdir}\tmp\</destination>
-                    <name>newfolder</name>
-                    <platforms>windows</platforms>
-                    <distributionFileList>
-                        <distributionFile>
-                            <origin>../../resources/postgres/restore_db_psql.bat</origin>
-                        </distributionFile>
-                    </distributionFileList>
-                </folder>
-            </folderList>
-            <postInstallationActionList>
-                <registryGetMatch>
-                    <key>HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\PostgreSQL*</key>
-                    <name>InstallLocation</name>
-                    <variable>postgresInstallLocation</variable>
-                    <wowMode>64</wowMode>
-                </registryGetMatch>
-                <registryGetMatch>
-                    <key>HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\PostgreSQL*</key>
-                    <name>InstallLocation</name>
-                    <variable>postgresInstallLocation</variable>
-                    <wowMode>32</wowMode>
-                    <ruleList>
-                        <compareTextLength>
-                            <length>1</length>
-                            <logic>less</logic>
-                            <text>${postgresInstallLocation}</text>
-                        </compareTextLength>
-                    </ruleList>
-                </registryGetMatch>
-                <createDirectory>
-                    <path>${installdir}\tmp\dhis2db</path>
-                </createDirectory>
-                <unzip>
-                    <destinationDirectory>${installdir}\tmp\dhis2db\</destinationDirectory>
-                    <zipFile>${installer_directory}\resources\dhis2db.zip</zipFile>
-                </unzip>
-                <findFile>
-                    <baseDirectory>${installdir}\tmp\dhis2db</baseDirectory>
-                    <pattern>*dhis*</pattern>
-                    <variable>databaseFile</variable>
-                </findFile>
-                <substitute>
-                    <files>${installdir}\tmp\restore_db_psql.bat</files>
-                    <type>exact</type>
-                    <substitutionList>
-                        <substitution>
-                            <pattern>PG_PASSWORD</pattern>
-                            <value>${pg_password}</value>
-                        </substitution>
-                        <substitution>
-                            <pattern>DATABASE_FILE</pattern>
-                            <value>${databaseFile}</value>
-                        </substitution>
-                        <substitution>
-                            <pattern>POSTGRES_INSTALL_LOCATION</pattern>
-                            <value>${postgresInstallLocation}</value>
-                        </substitution>
-                    </substitutionList>
-                </substitute>
-                <runProgram>
-                    <explanation>Restoring database</explanation>
-                    <program>restore_db_psql.bat</program>
-                    <programArguments></programArguments>
-                    <progressText>Restoring database. This might take a few minutes.</progressText>
-                    <workingDirectory>${installdir}\tmp\</workingDirectory>
-                </runProgram>
-                <deleteFile>
-                    <path>${installdir}\tmp\restore_db_psql.bat</path>
-                </deleteFile>
-            </postInstallationActionList>
-            <readyToInstallActionList>
-                <setInstallerVariable>
-                    <name>dhis2dbWarningIsShown</name>
-                    <value>true</value>
-                    <ruleList>
-                        <fileExists>
-                            <negate>1</negate>
-                            <path>${installer_directory}\resources\dhis2db.zip</path>
-                        </fileExists>
-                    </ruleList>
-                </setInstallerVariable>
-                <showWarning>
-                    <text>Cannot find dhis2db.zip in the resources folder. Place it there and press OK. If it is still not found, the installation process will be aborted.</text>
-                    <title>dhis2db.zip is missing</title>
-                    <ruleList>
-                        <fileExists>
-                            <negate>1</negate>
-                            <path>${installer_directory}\resources\dhis2db.zip</path>
-                        </fileExists>
-                    </ruleList>
-                </showWarning>
-                <throwError>
-                    <customErrorMessage>Could not find dhis2db.zip in the resources folder.</customErrorMessage>
-                    <text>Could not find dhis2db.zip in the resources folder.</text>
-                    <ruleList>
-                        <fileExists>
-                            <negate>1</negate>
-                            <path>${installer_directory}\resources\dhis2db.zip</path>
-                        </fileExists>
-                    </ruleList>
-                </throwError>
-                <showInfo>
-                    <text>Thank you! dhis2db.zip was located. The installation process will continue.</text>
-                    <title>Thank you!</title>
-                    <ruleList>
-                        <fileExists>
-                            <path>${installer_directory}\resources\dhis2db.zip</path>
-                        </fileExists>
-                        <isTrue>
-                            <value>${dhis2dbWarningIsShown}</value>
-                        </isTrue>
-                    </ruleList>
-                </showInfo>
-            </readyToInstallActionList>
-        </component>
-        <component>
-            <name>dhis2docs</name>
-            <description>DHIS2 Docs</description>
-            <canBeEdited>1</canBeEdited>
-            <selected>1</selected>
-            <show>1</show>
-            <postInstallationActionList>
-                <createDirectory>
-                    <path>${installdir}\docs</path>
-                </createDirectory>
-                <copyFile>
-                    <destination>${installdir}\docs\dhis2_user_manual_en.pdf</destination>
-                    <origin>${installer_directory}\resources\dhis2_user_manual_en.pdf</origin>
-                    <progressText>Adding DHIS 2 documentation</progressText>
-                </copyFile>
-            </postInstallationActionList>
-            <readyToInstallActionList>
-                <setInstallerVariable>
-                    <name>docsWarningIsShown</name>
-                    <value>true</value>
-                    <ruleList>
-                        <fileExists>
-                            <negate>1</negate>
-                            <path>${installer_directory}\resources\dhis2_user_manual_en.pdf</path>
-                        </fileExists>
-                    </ruleList>
-                </setInstallerVariable>
-                <showWarning>
-                    <text>Cannot find dhis2_user_manual_en.pdf in the resources folder. Place it there and press OK. If it is still not found, the installation process will be aborted.</text>
-                    <title>dhis2_user_manual_en.pdf is missing</title>
-                    <ruleList>
-                        <fileExists>
-                            <negate>1</negate>
-                            <path>${installer_directory}\resources\dhis2_user_manual_en.pdf</path>
-                        </fileExists>
-                    </ruleList>
-                </showWarning>
-                <throwError>
-                    <customErrorMessage>Could not find dhis2_user_manual_en.pdf in the resources folder.</customErrorMessage>
-                    <text>Could not find dhis2_user_manual_en.pdf in the resources folder.</text>
-                    <ruleList>
-                        <fileExists>
-                            <negate>1</negate>
-                            <path>${installer_directory}\resources\dhis2_user_manual_en.pdf</path>
-                        </fileExists>
-                    </ruleList>
-                </throwError>
-                <showInfo>
-                    <text>Thank you! dhis2_user_manual_en.pdf was located. The installation process will continue.</text>
-                    <title>Thank you!</title>
-                    <ruleList>
-                        <fileExists>
-                            <path>${installer_directory}\resources\dhis2_user_manual_en.pdf</path>
-                        </fileExists>
-                        <isTrue>
-                            <value>${docsWarningIsShown}</value>
-                        </isTrue>
-                    </ruleList>
-                </showInfo>
-            </readyToInstallActionList>
-        </component>
-        <component>
-            <name>Chrome</name>
-            <description>Google Chrome</description>
-            <canBeEdited>1</canBeEdited>
-            <selected>0</selected>
-            <show>1</show>
-            <postInstallationActionList>
-                <runProgram>
-                    <explanation>Installing Google Chrome</explanation>
-                    <program>ChromeStandaloneSetup.exe</program>
-                    <programArguments></programArguments>
-                    <progressText>Installling Google Chrome web browser</progressText>
-                    <workingDirectory>${installer_directory}\resources</workingDirectory>
-                </runProgram>
-            </postInstallationActionList>
-            <preInstallationActionList>
-                <componentSelection>
-                    <deselect></deselect>
-                    <select>Google Chrome</select>
-                </componentSelection>
-            </preInstallationActionList>
-            <readyToInstallActionList>
-                <setInstallerVariable>
-                    <name>chromeWarningIsShown</name>
-                    <value>true</value>
-                    <ruleList>
-                        <fileExists>
-                            <negate>1</negate>
-                            <path>${installer_directory}\resources\ChromeStandaloneSetup.exe</path>
-                        </fileExists>
-                    </ruleList>
-                </setInstallerVariable>
-                <showWarning>
-                    <text>Cannot find ChromeStandaloneSetup.exe in the resources folder. Place it there and press OK. If it is still not found, the installation process will be aborted.</text>
-                    <title>ChromeStandaloneSetup.exe is missing</title>
-                    <ruleList>
-                        <fileExists>
-                            <negate>1</negate>
-                            <path>${installer_directory}\resources\ChromeStandaloneSetup.exe</path>
-                        </fileExists>
-                    </ruleList>
-                </showWarning>
-                <throwError>
-                    <customErrorMessage>Could not find ChromeStandaloneSetup.exe in the resources folder.</customErrorMessage>
-                    <text>Could not find ChromeStandaloneSetup.exe in the resources folder.</text>
-                    <ruleList>
-                        <fileExists>
-                            <negate>1</negate>
-                            <path>${installer_directory}\resources\ChromeStandaloneSetup.exe</path>
-                        </fileExists>
-                    </ruleList>
-                </throwError>
-                <showInfo>
-                    <text>Thank you! ChromeStandaloneSetup.exe was located. The installation process will continue.</text>
-                    <title>Thank you!</title>
-                    <ruleList>
-                        <fileExists>
-                            <path>${installer_directory}\resources\ChromeStandaloneSetup.exe</path>
-                        </fileExists>
-                        <isTrue>
-                            <value>${chromeWarningIsShown}</value>
-                        </isTrue>
-                    </ruleList>
-                </showInfo>
-            </readyToInstallActionList>
-        </component>
-    </componentList>
-    <finalPageActionList>
-        <deleteFile>
-            <abortOnError>0</abortOnError>
-            <explanation>Delete temporary files</explanation>
-            <path>${installdir}\tmp\postgresql-9.0.3-1-windows.exe</path>
-        </deleteFile>
-    </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>
-    </parameterList>
-    <platformOptionsList>
-        <platformOptions>
-            <platform>windows</platform>
-        </platformOptions>
-    </platformOptionsList>
-</project>
-

=== removed directory 'installers/src/bitrock/temp'
=== removed directory 'installers/src/izpack'
=== removed file 'installers/src/izpack/ProcessPanel.Spec.xml'
--- installers/src/izpack/ProcessPanel.Spec.xml	2010-03-02 06:52:28 +0000
+++ installers/src/izpack/ProcessPanel.Spec.xml	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<processing>
-<!-- <job name="Install Visual C++ Runtime">
-		<executeForPack name="Postgres"/>
-       <os family="windows"/>  
-
-       <executefile name="$INSTALL_PATH\postgresql\vcredist_x86.exe">
-
- </executefile>
- </job>
-<job name="Install Postgresql Database server">
-	<executeForPack name="Postgres"/>
-       <os family="windows"/>  
-
-       <executefile name="msiexec.exe">
-
-      <arg>/i</arg>
-
-      <arg>$INSTALL_PATH\postgresql\postgresql-8.3.msi</arg>
-
- </executefile> 
- 
- </job> -->
- <job name="Install Java ">
-
-       <os family="windows"/>  
-
-       <executefile name="$INSTALL_PATH\java\jre-6u18-windows-i586-s.exe">
-
-
- </executefile>
- 
- </job>
-</processing>

=== removed file 'installers/src/izpack/install.xml'
--- installers/src/izpack/install.xml	2010-03-02 06:52:28 +0000
+++ installers/src/izpack/install.xml	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<installation version="1.0">
-	<info>
-		<appname>DHIS 2</appname>
-		<appversion>2.0.3</appversion>
-		<authors>
-			<author name="DHIS Developers" email="jason.p.pickering@xxxxxxxxx"/>
-		</authors>
-		<url>http://www.dhis2.org/</url>
-	</info>
-	<guiprefs width="640" height="480" resizable="yes"/>
-	
-	<locale>
-		<langpack iso3="eng"/>
-	</locale>
-	<!-- 
-        The resources section.
-        The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
-    -->
-
-
-	<resources>
-		<res id="LicencePanel.licence" src="Licence.txt"/>
-		<res id="InfoPanel.info" src="Readme.txt"/>
-		<res id="shortcutSpec.xml" src="shortcutSpec.xml"/>
-		<res id="ProcessPanel.Spec.xml" src="ProcessPanel.Spec.xml"/> 
-	</resources>
-	<!-- 
-        The panels section.
-        We indicate here which panels we want to use. The order will be respected.
-    -->
-	<panels>
-		<panel classname="HelloPanel"/>
-		<panel classname="InfoPanel"/>
-		<panel classname="LicencePanel"/>
-		<panel classname="TargetPanel"/>
-		<panel classname="PacksPanel"/>
-		<panel classname="InstallPanel"/>
-		<panel classname="ProcessPanel"/> 
-		<panel classname="ShortcutPanel"/>			
-		<panel classname="FinishPanel"/>
-	</panels>
-	
-	<!-- 
-        The packs section.
-        We specify here our packs.
-    -->
-	<packs>
-		<pack name="Base" required="yes">
-			<description>The base files</description>
-			<file src="Licence.txt" targetdir="$INSTALL_PATH"/>
-			<file src="Readme.txt" targetdir="$INSTALL_PATH"/>
-			<!-- The file will be parsed -->
-		</pack>
-		<pack name="Java update" required="no" os="windows">
-			<description>Java</description>
-			<file src="java" targetdir="$INSTALL_PATH"/>
-		</pack>
-		<!--<pack name="Postgres" required="no"  os="windows" installGroups="New Application">
-              <description>New server installation of the selected database as required by the application.</description>
-              <file src="postgresql" targetdir="$INSTALL_PATH"/>
-            </pack> -->
-
-		<pack name="Docs" required="no">
-			<description>The documentation</description>
-			<file src="docs" targetdir="$INSTALL_PATH"/>
-			<!-- Reccursive adding -->
-		</pack>
-		<pack name="Application" required="yes">
-			<description>The main app</description>
-			
-			<file src="conf" targetdir="$INSTALL_PATH"/>
-			<file src="database" targetdir="$INSTALL_PATH"/>
-			<file src="log" targetdir="$INSTALL_PATH"/>
-			<file src="webapps" targetdir="$INSTALL_PATH"/>
-			<file src="dhis2-live.jar" targetdir="$INSTALL_PATH"/>
-			<file src="dhis2-live.exe" targetdir="$INSTALL_PATH"/>
-		</pack>
-	</packs>
-	<native type="izpack" name="ShellLink.dll"/>
-</installation>

=== removed file 'installers/src/izpack/shortcutSpec.xml'
--- installers/src/izpack/shortcutSpec.xml	2010-03-02 06:52:28 +0000
+++ installers/src/izpack/shortcutSpec.xml	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<shortcuts>
-  <skipIfNotSupported/>
-  <programGroup defaultName="DHIS2"
-                location="applications"/>
-  <shortcut
-    name="Start DHIS2"
-    target="$INSTALL_PATH\dhis2-live.exe"
-    commandLine=""
-    workingDirectory="$INSTALL_PATH\"
-    description="Start DHIS2"
-    iconIndex="0"
-    initialState="normal"
-    programGroup="yes"
-    desktop="yes"
-    applications="yes"
-    startMenu="yes"
-    startup="no">
-  </shortcut>
-    <shortcut
-    name="DHIS2 Documentation"
-    target="$INSTALL_PATH\docs\dhis2_user_manual_en.pdf"
-    commandLine=""
-    workingDirectory=""
-    description="DHIS2 Documentation"
-    initialState="noShow"
-    programGroup="yes"
-    desktop="no"
-    applications="no"
-    startMenu="no"
-    startup="no"
-	type="Application"
-	encoding="UTF-8"
-	iconfile="%SystemRoot%\system32\SHELL32.dll"
-	iconIndex="23"
-    >
-  </shortcut>
-  <shortcut
-name="Uninstall DHIS2"
-programGroup="yes"
-desktop="yes"
-applications="no"
-startMenu="no"
-startup="no"
-target="java"
-commandLine="-jar
-&quot;$INSTALL_PATH/Uninstaller/uninstaller.jar&quot;"
-initialState="noShow"
-iconFile="%SystemRoot%\system32\SHELL32.dll"
-iconIndex="32"
-workingDirectory=""
-type="Application"
-encoding="UTF-8"
-description="DHIS2 uninstaller">
-
-</shortcut>
-</shortcuts>

=== removed directory 'installers/src/nsis'
=== removed file 'installers/src/nsis/dhis.nsi'
--- installers/src/nsis/dhis.nsi	2011-03-10 14:37:48 +0000
+++ installers/src/nsis/dhis.nsi	1970-01-01 00:00:00 +0000
@@ -1,327 +0,0 @@
-!define AppName "DHIS2"
-!define AppVersion "2.2.0"
-!define ShortName "DHIS2"
-!define Vendor "HISP"
-
-
-; JDK defines
-!define JDK_INSTALLER "jdk-6u24-windows-i586.exe"
-!define JDK_VERSION "1.7.21"
-
-;MySQL defines
-!define MYSQL_INSTALLER "mysql-5.5.9-win32.msi"
-!define MYSQL_VERSION "5.5.9"
-!define MYSQL_PORT "3306" 
-!define MYSQL_SERVICE_NAME "MYSQL55"
-!define MYSQL_SCHEMA_NAME "dhis"
-!define MYSQL_USER "root"
-!define MYSQL_PASS "root"
-!define MYSQL_DUMP_FILE "dump.sql"
-!define MYSQL_HOST "localhost"
-
-;Tomcat defines
-!define TOMCAT_INSTALLER "apache-tomcat-6.0.32.exe"
-!define TOMCAT_VERSION "6.0.21"
-
-;DHIS war and hibernate defines
-!define HIBERNATE_FILE "hibernate.properties"
-!define WAR "dhis.war"
-
-;Browser (Chrome) defines
-!define BROWSER_INSTALLER "ChromeStandaloneSetup.exe"
-
-; Include files
-!include "LogicLib.nsh"
-!include "nsDialogs.nsh"
-!include "TextFunc.nsh"
-!include "WordFunc.nsh"
-;!include "EnvVarUpdate.nsh"
- 
-!insertmacro ConfigWrite
-!insertmacro ConfigRead
-
-
-; Needed Variables
-
-VAR JAVAINST            ; To test if JDK should be installed
-
-!insertmacro VersionCompare
-
-;--------------------------------
-;Include Modern UI
-
-!include "MUI2.nsh"
-
-;--------------------------------
-;General
-
-  ;Name and file
-  Name "DHIS All in One Installer"
-  OutFile "DHIS2 Installer.exe"
-
-  ;Default installation folder
-  InstallDir "$LOCALAPPDATA\DHIS2"
-
-  ;Get installation folder from registry if available
-  InstallDirRegKey HKCU "Software\DHIS2" ""
-
-  ;Request application privileges for Windows Vista
-  ;RequestExecutionLevel Admin
-  
-;--------------------------------
-;Interface Settings
-
-  !define MUI_ABORTWARNING
-
-;--------------------------------
-;Pages
-
-  !insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Docs\Modern UI\License.txt"
-  !insertmacro MUI_PAGE_COMPONENTS
-  Page custom CheckInstalledJRE  
-  ; Define headers for the 'Java installation successfully' page
-  !define MUI_INSTFILESPAGE_FINISHHEADER_TEXT "Java installation complete"
-  !define MUI_PAGE_HEADER_TEXT "Installing JDK"
-  !define MUI_PAGE_HEADER_SUBTEXT "Please wait while we install the JDK"
-  !define MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT "JDK installed successfully."
-  !insertmacro MUI_PAGE_DIRECTORY
-  !insertmacro MUI_PAGE_INSTFILES
-  !define MUI_INSTFILESPAGE_FINISHHEADER_TEXT "JDK Installation complete"
-  !define MUI_PAGE_HEADER_TEXT "Installing"
-  !define MUI_PAGE_HEADER_SUBTEXT "Please wait while Tomcat Web Server is being installed."
-
-  !insertmacro MUI_PAGE_FINISH
-  !insertmacro MUI_UNPAGE_CONFIRM
-  !insertmacro MUI_UNPAGE_INSTFILES
-  
-;--------------------------------
-;Languages
-  !insertmacro MUI_LANGUAGE "English"
-
-;--------------------------------
-;Installer Sections
-
-Section "Java Development Kit" jdk
-SectionIn 1 RO    ; Full install, cannot be unselected
-    SetOutPath "$INSTDIR"
-    SetOverwrite ifnewer
-
-    ${if} $JAVAINST == "yes"
-DetailPrint "Starting JDK installation"
-Goto InstJDK    
-    ${else}
-        DetailPrint "Skipping JDK installation"
-        Goto JavaHomeNo
-    ${endif}
-
-InstJDK:    
-        File "Tools\${JDK_INSTALLER}"
-        ExecWait '"$INSTDIR\${JDK_INSTALLER}" /s /log jdk_logs.txt'
-        Delete "$INSTDIR\${JDK_INSTALLER}"
-
-  ReadRegStr $7 HKLM "SOFTWARE\JavaSoft\Java Development Kit" "CurrentVersion"
-MessageBox MB_OK "Installed JDK Version : $7"
-  ReadRegStr $8 HKLM "SOFTWARE\JavaSoft\Java Development Kit\$7" "JavaHome"
-MessageBox MB_OK "Installed JDK Path : $8"
-
-
-            Goto SetEnvers
-
-SetEnvers:
-     
-  JavaHomeNo:
-
-
-SectionEnd
-
-Section "MySQL Windows service" mysql
-SectionIn 1 RO    ; Full install, cannot be unselected
-    SetOutPath "$INSTDIR"
-    SetOverwrite ifnewer
-
-        File "Tools\${MYSQL_INSTALLER}"
-ExecWait 'msiexec.exe /i "$INSTDIR\${MYSQL_INSTALLER}" /qn INSTALLDIR="$INSTDIR\MySQL\" /L* "$INSTDIR\MSI-MySQL-Log.txt"'
-
-        Delete "$INSTDIR\${MYSQL_INSTALLER}"
-
-  ReadRegStr $7 HKLM "SOFTWARE\MySQL AB\MySQL Server 5.5" "Version"
-MessageBox MB_OK "Installed MySQL Version : $7"
-  ReadRegStr $8 HKLM "SOFTWARE\MySQL AB\MySQL Server 5.5" "Location"
-MessageBox MB_OK "Installed MySQL Path : $8"
-
-
-ExecWait '$8bin\MySQLInstanceConfig.exe -i -q "-l$INSTDIR\MSI-MySQL-Log.txt" "-nMySQL Server 5.5" "-p$8" -v${MYSQL_VERSION}"-t$8my-template.ini" "-c$8my.ini" ServerType=SERVER DatabaseType=MIXED ConnectionUsage=DSS Port=${MYSQL_PORT} ServiceName=${MYSQL_SERVICE_NAME} RootPassword=${MYSQL_PASS}'
-MessageBox MB_OK "Successfully Configured MySQL Instance"
-ExecWait '$8bin\mysqlslap --silent --delimiter=";" --user=${MYSQL_USER} --password=${MYSQL_PASS} --engine=innodb --create="CREATE TABLE a (b int);INSERT INTO a VALUES (23)" --query="SELECT * FROM a" --concurrency=1 --iterations=1 --query="DROP TABLE a"'
-MessageBox MB_OK "MySQL Instance Successfully Passed Tests."
-
-ExecWait '$8bin\mysql --silent -u${MYSQL_USER} -p${MYSQL_PASS} -e "CREATE SCHEMA ${MYSQL_SCHEMA_NAME}"'
-MessageBox MB_OK "${MYSQL_SCHEMA_NAME} SCHEMA Created Successfully"
-
-        File "dhis\${MYSQL_DUMP_FILE}"
-ReadEnvStr $R0 COMSPEC
-
-Exec '"$R0" /C $8bin\mysql --silent --wait --reconnect --user=${MYSQL_USER} --password=${MYSQL_PASS} --host=${MYSQL_HOST} --database=${MYSQL_SCHEMA_NAME} < "$INSTDIR\${MYSQL_DUMP_FILE}"'
-        Delete "$INSTDIR\${MYSQL_DUMP_FILE}"
-MessageBox MB_OK "${MYSQL_SCHEMA_NAME} SCHEMA Tables Created Successfully"
-        
-SectionEnd
-
-
-Section "Tomcat 6 Windows service and ${AppName}" tomcat
-SectionIn 1 RO    ; Full install, cannot be unselected
-    SetOutPath "$INSTDIR"
-    SetOverwrite ifnewer
-
-        File "Tools\${TOMCAT_INSTALLER}"
-        ExecWait '"$INSTDIR\${TOMCAT_INSTALLER}" /S /D=$INSTDIR\tomcat6\'
-        Delete "$INSTDIR\${TOMCAT_INSTALLER}"
-
-    WriteRegExpandStr HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "DHIS2_HOME" $INSTDIR
-    ; ... and for this context
-    System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("DHIS2_HOME", "$INSTDIR").r0'
-
-        File "dhis\${HIBERNATE_FILE}"
-
-    SetOutPath "$INSTDIR\tomcat6\webapps\"
-    SetOverwrite ifnewer
-
-        File "dhis\${WAR}"
-
-    ExecWait '"$INSTDIR\tomcat6\bin\tomcat6.exe" //IS//Tomcat6 --DisplayName="Apache Tomcat 6 for DHIS" --Install="$INSTDIR\tomcat6\bin\tomcat6.exe"  --Startup=auto --Jvm=auto --StartMode=jvm --StopMode=jvm --StartClass=org.apache.catalina.startup.Bootstrap --StartParams=start --StopClass=org.apache.catalina.startup.Bootstrap --StopParams=stop'
-
-    SetOutPath "$INSTDIR"
-    SetOverwrite ifnewer
-
-    File "Tools\${BROWSER_INSTALLER}"
-        
-ExecWait '"$INSTDIR\${BROWSER_INSTALLER}" /S --system-level'
-;--do-not-launch-chrome
-
-        Delete "$INSTDIR\${BROWSER_INSTALLER}"
-
-
-SectionEnd
-
-;dhis
-Section "Installation of ${AppName}" SecAppFiles
-SectionIn 1 RO    ; Full install, cannot be unselected
-  SetOutPath "$INSTDIR"
-
-  ;ADD YOUR OWN FILES HERE...
-
-  ;Store installation folder
-  WriteRegStr HKCU "Software\DHIS" "" $INSTDIR
-
-  ;Create uninstaller
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
-SectionEnd
-
-Section "Start menu shortcuts" SecCreateShortcut
-  SectionIn 1   ; Can be unselected
-  CreateDirectory "$SMPROGRAMS\${AppName}"
-  CreateShortCut "$SMPROGRAMS\${AppName}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-; Etc
-SectionEnd
-
-;--------------------------------
-;Descriptions
-
-  ;Language strings
-  LangString DESC_SecDummy ${LANG_ENGLISH} "A test section."
-
-  ;Assign language strings to sections
-  !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-    !insertmacro MUI_DESCRIPTION_TEXT ${SecAppFiles} $(DESC_SecDummy)
-  !insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-;--------------------------------
-;Uninstaller Section
-
-Section "Uninstall"
-
-  Delete "$INSTDIR\Uninstall.exe"
-
-  RMDir "$INSTDIR"
-
-  DeleteRegKey /ifempty HKCU "Software\DHIS2"
-
-SectionEnd
-
-Function SetupSections
-  !insertmacro SelectSection ${jdk}
-  !insertmacro SelectSection ${tomcat}  
-  !insertmacro SelectSection ${SecAppFiles}
-  !insertmacro SelectSection ${SecCreateShortcut}
-FunctionEnd
-
-Function CheckInstalledJRE
-;  MessageBox MB_OK "Checking Installed JRE Version"
-  Push "${JDK_VERSION}"
-  Exch $0   ; Get version requested
-
-  ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Development Kit" "CurrentVersion"
-  ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Development Kit\$1" "JavaHome"
-
-${If} $1 != ''
-;  MessageBox MB_OK "Detected JDK version is : $1"
-;  MessageBox MB_OK "Detected JDK Path is : $2"
-  Goto CompareMajorVersion        
-${ElseIf} $2 != ''
-;  MessageBox MB_OK "Detected JDK Path is : $2"
-${Else}
-;  MessageBox MB_OK 'No Installed JDK found'
-  Goto InstallJDK
-${EndIf}
-
-CompareMajorVersion:
-
-  StrCpy $3 $0 1     
-  StrCpy $4 $1 1     
-
-${If} $4 = $3
-;  MessageBox MB_OK "Need $3 , found $4"
-  Goto CompareMinorVersion
-${ElseIf} $4 > $3
-;  MessageBox MB_OK " $3 is less than $4"
-  Goto DontInstallJDK  
-${Else}
-;  MessageBox MB_OK "$3 more than $4"
-  Goto InstallJDK
-${EndIf}
-
-
-CompareMinorVersion:
-
-  StrCpy $5 $0 1 2
-  StrCpy $6 $1 1 2   
-;  MessageBox MB_OK "Need $5 , found $6" 
-
-${If} $5 = $6
-;  MessageBox MB_OK "Need $5 , found $6"
-  Goto DontInstallJDK  
-${ElseIf} $6 > $5
-;  MessageBox MB_OK " $5 is less than $6"
-  Goto DontInstallJDK  
-${Else}
-;  MessageBox MB_OK "$5 more than $6"
-  Goto InstallJDK
-${EndIf}
-
-
-InstallJDK:
-;  Messagebox MB_OK "Done checking JRE version, reccomend install"  
-StrCpy $JAVAINST 'yes'
-Goto End
-
-DontInstallJDK:
-;  Messagebox MB_OK "Done checking JRE version, reccomend cancel"
-StrCpy $JAVAINST 'no'
-
-End:
-;  Messagebox MB_OK "Done checking JRE version"
-FunctionEnd
-
-Function .onInit
-  Call SetupSections 
-FunctionEnd