[jbpm-commits] JBoss JBPM SVN: r6521 - in jbpm4/trunk: modules/distro/src/main/files/examples and 2 other directories.

Author: alex.guizar(a)jboss.com Date: 2010-07-21 01:01:09 -0400 (Wed, 21 Jul 2010) New Revision: 6521 Modified: jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/JbpmVersion.java jbpm4/trunk/modules/distro/src/main/files/examples/build.xml jbpm4/trunk/modules/distro/src/main/files/install/build.xml jbpm4/trunk/qa/build.xml Log: JBPM-2714: fix hudson upgrade job; pass jbpm.version property to downstream builds Modified: jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/JbpmVersion.java =================================================================== --- jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/JbpmVersion.java 2010-07-20 12:05:33 UTC (rev 6520) +++ jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/JbpmVersion.java 2010-07-21 05:01:09 UTC (rev 6521) @@ -26,7 +26,7 @@ */ public enum JbpmVersion { - V_4_0, V_4_1, V_4_2, V_4_3, V_4_4; + V_4_0, V_4_1, V_4_2, V_4_3, V_4_4, V_4_5; public String toString() { return "4." + ordinal(); Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2010-07-20 12:05:33 UTC (rev 6520) +++ jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2010-07-21 05:01:09 UTC (rev 6521) @@ -17,8 +17,13 @@ <!-- DEFAULT PROPERTY VALUES --> <property name="database" value="hsqldb" /> <property name="jboss.version" value="5.1.0.GA" /> - <condition property="jbpm.home" value="${jbpm.parent.dir}/jbpm-4.x" else="${basedir}/.."> - <isset property="jbpm.parent.dir" /> + <condition property="jbpm.home" + value="${jbpm.parent.dir}/jbpm-${jbpm.version}" + else="${basedir}/.."> + <and> + <isset property="jbpm.parent.dir" /> + <isset property="jbpm.version" /> + </and> </condition> <!-- JDBC PROPERTIES --> Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2010-07-20 12:05:33 UTC (rev 6520) +++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2010-07-21 05:01:09 UTC (rev 6521) @@ -19,8 +19,13 @@ <property name="database" value="hsqldb" /> <!-- INTERNAL PROPERTY DEFAULTS --> - <condition property="jbpm.home" value="${jbpm.parent.dir}/jbpm-4.x" else="${basedir}/.."> - <isset property="jbpm.parent.dir" /> + <condition property="jbpm.home" + value="${jbpm.parent.dir}/jbpm-${jbpm.version}" + else="${basedir}/.."> + <and> + <isset property="jbpm.parent.dir" /> + <isset property="jbpm.version" /> + </and> </condition> <property name="cfg.dest.dir" value="${jbpm.home}/install/generated/cfg" /> <property name="install.src.dir" value="${jbpm.home}/install/src" /> Modified: jbpm4/trunk/qa/build.xml =================================================================== --- jbpm4/trunk/qa/build.xml 2010-07-20 12:05:33 UTC (rev 6520) +++ jbpm4/trunk/qa/build.xml 2010-07-21 05:01:09 UTC (rev 6521) @@ -291,12 +291,8 @@ <java classname="org.jbpm.upgrade.BeforeUpgrade" fork="true"> <classpath> <pathelement location="upgrade/target/jbpm-test-upgrade" /> - <fileset dir="${old.jbpm.home}"> - <include name="jbpm.jar" /> - </fileset> - <fileset dir="${old.jbpm.home}/lib"> - <include name="*.jar" /> - </fileset> + <pathelement location="${old.jbpm.home}/jbpm.jar" /> + <fileset dir="${old.jbpm.home}/lib" includes="*.jar" /> </classpath> </java> @@ -342,6 +338,7 @@ </replace> <ant antfile="${old.jbpm.home}/db/build.xml" target="create.jbpm.schema" inheritall="false"> <property name="database" value="${database}" /> + <property name="jbpm.version" value="${old.jbpm.version}" /> </ant> <copy file="${old.jbpm.home}/db/hibernate.cfg/${database}.hibernate.cfg.xml" tofile="upgrade/target/jbpm-test-upgrade/jbpm.hibernate.cfg.xml" @@ -360,6 +357,7 @@ target="create.jbpm.schema" inheritall="false"> <property name="database" value="${database}" /> + <property name="jbpm.version" value="${old.jbpm.version}" /> </ant> <copy file="${old.jbpm.home}/install/src/cfg/hibernate/jdbc/${database}.hibernate.cfg.xml" tofile="upgrade/target/jbpm-test-upgrade/jbpm.hibernate.cfg.xml"