Author: tom.baeyens(a)jboss.com Date: 2009-05-15 05:59:31 -0400 (Fri, 15 May 2009) New Revision: 4820 Modified: jbpm4/trunk/modules/distro/src/main/files/db/build.xml jbpm4/trunk/modules/distro/src/main/files/examples/build.xml jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml Log: fixed reference to user-local jdbc properties Modified: jbpm4/trunk/modules/distro/src/main/files/db/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/build.xml 2009-05-15 09:59:03 UTC (rev 4819) +++ jbpm4/trunk/modules/distro/src/main/files/db/build.xml 2009-05-15 09:59:31 UTC (rev 4820) @@ -5,16 +5,16 @@ <!-- DEVELOPER SPECIFIC CONFIGURATIONS --> <property file="${user.home}/.jbpm4/build.properties" /> - <!-- JDBC PROPERTIES --> - <property file="${user.home}/jdbc/${database}.properties" /> - <property file="${jbpm.home}/db/jdbc/${database}.properties" /> - <!-- DEFAULT PROPERTY VALUES --> <property name="database" value="hsqldb" /> <property name="jbpm.parent.dir" value="../.." /> <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> + <!-- JDBC PROPERTIES --> + <property file="${user.home}/.jbpm4/jdbc/${database}.properties" /> + <property file="${jbpm.home}/db/jdbc/${database}.properties" /> + <!-- ### LOG PROPERTIES ################################################# --> <target name="log.properties"> <echo message="database....... ${database}" /> Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-05-15 09:59:03 UTC (rev 4819) +++ jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-05-15 09:59:31 UTC (rev 4820) @@ -5,10 +5,6 @@ <!-- DEVELOPER SPECIFIC CONFIGURATIONS --> <property file="${user.home}/.jbpm4/build.properties" /> - <!-- JDBC PROPERTIES --> - <property file="${user.home}/jdbc/${database}.properties" /> - <property file="${jbpm.home}/db/jdbc/${database}.properties" /> - <!-- DEFAULT PROPERTY VALUES --> <property name="database" value="hsqldb" /> <property name="jbpm.parent.dir" value="../.." /> @@ -16,7 +12,11 @@ <property name="jboss.version" value="5.0.0.GA" /> <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> - <!-- ### LOG PROPERTIES ################################################# --> + <!-- JDBC PROPERTIES --> + <property file="${user.home}/.jbpm4/jdbc/${database}.properties" /> + <property file="${jbpm.home}/db/jdbc/${database}.properties" /> + + <!-- ### LOG PROPERTIES ################################################# --> <target name="log.properties"> <echo message="database: ${database}" /> <echo message="jdbc.driver........ ${jdbc.driver}" /> Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-05-15 09:59:03 UTC (rev 4819) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-05-15 09:59:31 UTC (rev 4820) @@ -5,10 +5,6 @@ <!-- DEVELOPER SPECIFIC CONFIGURATIONS --> <property file="${user.home}/.jbpm4/build.properties" /> - <!-- JDBC PROPERTIES --> - <property file="${user.home}/jdbc/${database}.properties" /> - <property file="${jbpm.home}/db/jdbc/${database}.properties" /> - <!-- DEFAULT PROPERTY VALUES --> <property name="database" value="hsqldb" /> <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> @@ -25,6 +21,10 @@ <property name="jboss.server.configuration" value="default" /> <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> + <!-- JDBC PROPERTIES --> + <property file="${user.home}/.jbpm4/jdbc/${database}.properties" /> + <property file="${jbpm.home}/db/jdbc/${database}.properties" /> + <!-- ### LOG PROPERTIES ################################################# --> <target name="log.properties"> <echo message="database.................... ${database}" />