midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Organize installer

This commit is contained in:
Carlos Ruiz 2006-12-27 18:30:36 +00:00
parent 2a8d954c60
commit d7a5e1b4d4
3 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
install/Adempiere/build.xml
View File

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

2
install/src/org/compiere/install/ConfigOracle.java
View File

@ -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();

1
install/src/org/compiere/install/ConfigPostgreSQL.java
View File

@ -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();