From d7a5e1b4d4006549c39a33a62697fec84995c662 Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Wed, 27 Dec 2006 18:30:36 +0000
Subject: [PATCH] Organize installer

---
 install/Adempiere/build.xml                   | 36 ++++---------------
 .../org/compiere/install/ConfigOracle.java    |  2 +-
 .../compiere/install/ConfigPostgreSQL.java    |  1 +
 3 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/install/Adempiere/build.xml b/install/Adempiere/build.xml
index 62ccdfcede..fafb284e71 100644
--- a/install/Adempiere/build.xml
+++ b/install/Adempiere/build.xml
@@ -46,34 +46,10 @@
 		<condition property="isAppsTomcat">
 			<equals arg1="tomcatOnly" arg2="${ADEMPIERE_APPS_TYPE}" />
 		</condition>
-		<condition property="isPostgresql80">
-			<equals arg1="postgresql80" arg2="${ADEMPIERE_DB_TYPE}" />
-		</condition>
-		<condition property="isPostgresql81">
-			<equals arg1="postgresql81" arg2="${ADEMPIERE_DB_TYPE}" />
-		</condition>
 		<echo message="Windows=${isWindows} JBoss=${isAppsJBoss} Tomcat=${isAppsTomcat}" />
 
 	</target>
 
-	<!-- ==================================================== -->
-	<!-- unpack Postgresql db dump for postgresql 8.0         -->
-	<!-- Kinamo (pelgrim)                                     -->
-	<!-- ==================================================== -->
-	<target name="InitDBdumppg80" depends="setupInit" if="isPostgresql80" 
-		description="Deploy Database dump postgresql 8.0">
-		<unjar src="data/adempiere310_pgsql80.jar" dest="data"/>
-	</target>
-
-	<!-- ==================================================== -->
-	<!-- unpack Postgresql db dump for postgresql 8.1         -->
-	<!-- Kinamo (pelgrim)                                     -->
-	<!-- ==================================================== -->
-	<target name="InitDBdumppg81" depends="setupInit" if="isPostgresql81" 
-		description="Deploy Database dump postgresql 8.1">
-		<unjar src="data/adempiere310_pgsql81.jar" dest="data"/>
-	</target>
-
 	<!-- ==================================================== -->
 	<!-- Windows Setup                                        -->
 	<!-- ==================================================== -->
@@ -201,12 +177,12 @@
 		<unjar src="lib/CSTools.jar" dest="buildSLib" />
 		<unjar src="lib/freepdf.jar" dest="buildSLib" />
 		<!-- Selected Database	-->
-                 <!--begin vpj-cd e-evolution-->
+        <!--begin vpj-cd e-evolution-->
 		<!--unjar src="lib/${ADEMPIERE_DB_TYPE}.jar" dest="buildSLib" /-->
-                <unjar src="lib/oracle.jar" dest="buildSLib" />
-                <unjar src="lib/postgresql.jar" dest="buildSLib" />
-                <unjar src="lib/db2.jar" dest="buildSLib" />
-                <!--end vpj-cd e-evolution-->
+        <unjar src="lib/oracle.jar" dest="buildSLib" />
+        <unjar src="lib/postgresql.jar" dest="buildSLib" />
+        <unjar src="lib/db2.jar" dest="buildSLib" />
+        <!--end vpj-cd e-evolution-->
         <unjar src="lib/fyracle.jar" dest="buildSLib" />
 
 
@@ -536,4 +512,4 @@
  
 	</target>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/install/src/org/compiere/install/ConfigOracle.java b/install/src/org/compiere/install/ConfigOracle.java
index 9442612f83..cba52e9268 100644
--- a/install/src/org/compiere/install/ConfigOracle.java
+++ b/install/src/org/compiere/install/ConfigOracle.java
@@ -304,7 +304,7 @@ public class ConfigOracle extends Config
 		log.info("OK: Database Server = " + databaseServer);
 		setProperty(ConfigurationData.ADEMPIERE_DB_SERVER, databaseServer.getHostName());
 		setProperty(ConfigurationData.ADEMPIERE_DB_TYPE, p_data.getDatabaseType());
-		setProperty(ConfigurationData.ADEMPIERE_DB_PATH, "oracle");
+		setProperty(ConfigurationData.ADEMPIERE_DB_PATH, p_data.getDatabaseType());
 
 		//	Database Port
 		int databasePort = p_data.getDatabasePort();
diff --git a/install/src/org/compiere/install/ConfigPostgreSQL.java b/install/src/org/compiere/install/ConfigPostgreSQL.java
index 4085da5a3a..c31dc0b652 100755
--- a/install/src/org/compiere/install/ConfigPostgreSQL.java
+++ b/install/src/org/compiere/install/ConfigPostgreSQL.java
@@ -93,6 +93,7 @@ public class ConfigPostgreSQL extends Config
 		log.info("OK: Database Server = " + databaseServer);
 		setProperty(ConfigurationData.ADEMPIERE_DB_SERVER, databaseServer.getHostName());
 		setProperty(ConfigurationData.ADEMPIERE_DB_TYPE, p_data.getDatabaseType());
+		setProperty(ConfigurationData.ADEMPIERE_DB_PATH, p_data.getDatabaseType());
 
 		//	Database Port
 		int databasePort = p_data.getDatabasePort();