dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1983
committer: Jason Pickering <jason@karolina-laptop>
branch nick: dhis2
timestamp: Thu 2010-06-10 11:07:05 +0200
message:
  Trivial changes to the build script. Added the Live XML configuration draft.
added:
  dhis-live/util/config/
  dhis-live/util/config/dhislive-config.xml
modified:
  dhis2-live-installer/build.sh


--
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

=== added directory 'dhis-live/util/config'
=== added file 'dhis-live/util/config/dhislive-config.xml'
--- dhis-live/util/config/dhislive-config.xml	1970-01-01 00:00:00 +0000
+++ dhis-live/util/config/dhislive-config.xml	2010-06-10 09:07:05 +0000
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<dhis_live_conf>
+ <databases selected="1">
+    <database name="Production DB" id="1">
+        <driverClass>org.hibernate.dialect.PostgreSQLDialect</driverClass>
+        <url>jdbc:postgresql://127.0.0.1:5432/dhis2_zm_prod2
+        <username>postgres</username>
+        <password>postgres</password>
+    </database>
+        <database name="Test DB" id="1">
+        <driverClass>org.hibernate.dialect.PostgreSQLDialect</driverClass>
+        <url>jdbc:postgresql://127.0.0.1:5432/dhis2_zm_test
+        <username>postgres</username>
+        <password>postgres</password>
+        <options>
+        	<option>
+        		<type>hibernate.hbm2ddl.auto</type>
+        		<value>update</value>
+        	</option>
+        </options>
+    </database>
+    <browsers selected="1">
+    	<browser name= "Firefox" id="1">
+    		<name>Firefox</name>
+    		<path>/usr/share/bin/firefox</path>
+    	</browser>
+    </browsers>
+ </databases>
+</dhis_live_conf>
\ No newline at end of file

=== modified file 'dhis2-live-installer/build.sh'
--- dhis2-live-installer/build.sh	2010-04-21 07:46:29 +0000
+++ dhis2-live-installer/build.sh	2010-06-10 09:07:05 +0000
@@ -1,13 +1,22 @@
 #/bin/sh
-export JAVA_HOME=/usr/local/java/jdk1.6.0_18/
-export PATH=$PATH:/home/wheel/apache-maven-2.2.1/bin/
-export BITROCK_HOME=/home/wheel/installbuilder-6.2.7/
+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/wheel/workspace/dhis2-docbook-docs/"
-export DHIS2_SRC="/home/wheel/workspace/dhis2/"
+export DHIS2_DOCS="/home/jason/dhis2/dhis2-docbook-docs/"
+export DHIS2_SRC="/home/jason/dhis2/dhis2/"
 export MAVEN_OPTS="-Xms256m -Xmx512m"
 
-if [ "$1" = "all" ] ; then
+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
@@ -23,22 +32,20 @@
 mvn package
 echo "Building installer"
 cd $DHIS2_SRC/dhis2-live-installer
-mvn package
-
-fi
-
-if [ "$1" = "docs" ] ; then
+mvn package ;;
+
+docs)
+
 cd $DHIS2_DOCS
-mvn package
-fi
-
-if [ "$1" = "installer" ] ; then
+mvn package ;;
+
+
+installer)
 echo "Building installer"
 cd $DHIS2_SRC/dhis2-live-installer
-mvn package
-fi
+mvn package ;;
 
-if [ "$1" = "dhis2" ] ; then
+dhis2)
 
 echo "Building DHIS 2 Core..."
 cd $DHIS2_SRC/dhis-2
@@ -48,6 +55,6 @@
 mvn clean install -Dtest=skip -DfailIfNoTests=false
 echo "Builidng DHIS2 Live Package"
 cd $DHIS2_SRC/dhis-live/
-mvn clean package -Dtest=skip -DfailIfNoTests=false
+mvn clean package -Dtest=skip -DfailIfNoTests=false ;;
 
-fi
+esac