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

Author: alex.guizar(a)jboss.com Date: 2010-07-16 08:42:10 -0400 (Fri, 16 Jul 2010) New Revision: 6500 Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml jbpm4/trunk/modules/distro/src/main/files/install/build.xml jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml jbpm4/trunk/qa/build.xml jbpm4/trunk/qa/hudson-jbpm4-db.sh jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh jbpm4/trunk/qa/hudson-jbpm4-jboss.sh jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh jbpm4/trunk/qa/hudson-jbpm4-upgrade.sh Log: JBPM-2893: take the jbpm.version property out of the install, examples and qa build files have hudson shell scripts determine the jbpm.version from the pom file replace bind address in tomcat server xml file properly (via Hui Sheng Xu) Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2010-07-15 20:23:30 UTC (rev 6499) +++ jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2010-07-16 12:42:10 UTC (rev 6500) @@ -16,10 +16,10 @@ <!-- DEFAULT PROPERTY VALUES --> <property name="database" value="hsqldb" /> - <property name="jbpm.parent.dir" value="../.." /> - <property name="jbpm.version" value="4.4-SNAPSHOT" /> - <property name="jboss.version" value="5.0.0.GA" /> - <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> + <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> <!-- JDBC PROPERTIES --> <property file="${user.home}/.jbpm4/jdbc/${database}.properties" /> @@ -31,7 +31,6 @@ <echo message="jdbc.driver........ ${jdbc.driver}" /> <echo message="jdbc.url........... ${jdbc.url}" /> <echo message="jdbc.username...... ${jdbc.username}" /> - <echo message="jbpm.version....... ${jbpm.version}" /> <echo message="jbpm.home.......... ${jbpm.home}" /> </target> Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2010-07-15 20:23:30 UTC (rev 6499) +++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2010-07-16 12:42:10 UTC (rev 6500) @@ -21,9 +21,9 @@ <property name="tx" value="standalone" /> <!-- INTERNAL PROPERTY DEFAULTS --> - <property name="jbpm.version" value="4.4-SNAPSHOT" /> - <property name="jbpm.parent.dir" value="../.." /> - <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> + <condition property="jbpm.home" value="${jbpm.parent.dir}/jbpm-4.x" else="${basedir}/.."> + <isset property="jbpm.parent.dir" /> + </condition> <!-- jdbc | datasource --> <property name="hibernate.connection.type" value="jdbc" /> <!-- jdk | none --> @@ -592,7 +592,7 @@ <filterset filtersfile="${jdbc.properties.dir}/${database}.properties" /> </copy> <replace file="${tomcat.home}/conf/server.xml" - token=&quot;@bind.address(a)&quot; + token="$${bind.address}" value="${bind.address}" /> </target> Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml 2010-07-15 20:23:30 UTC (rev 6499) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml 2010-07-16 12:42:10 UTC (rev 6500) @@ -23,25 +23,25 @@ <Service name="Catalina"> - <Connector address=&quot;@bind.address(a)&quot; port="8080" protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="8443" /> + <Connector address="${bind.address}" port="8080" protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="8443" /> - <Connector address=&quot;@bind.address(a)&quot; port="8009" protocol="AJP/1.3" redirectPort="8443" /> + <Connector address="${bind.address}" port="8009" protocol="AJP/1.3" redirectPort="8443" /> <Engine name="Catalina" defaultHost="localhost"> <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false"> - <!-- + <!-- Current workaround for using the JBPM identity tables on Tomcat. Setting the Realm on the context with path /jbpm-console did not seem - to work. Note that this workaround means that the cmplete localhost + to work. Note that this workaround means that the cmplete localhost domain will use this realm ! --> <Realm className="org.jbpm.integration.tomcat6.JbpmConsoleRealm" - driverName=&quot;@jdbc.driver(a)&quot; + driverName=&quot;@jdbc.driver(a)&quot; connectionUrl=&quot;@jdbc.url(a)&quot; - connectionName=&quot;@jdbc.username(a)&quot; + connectionName=&quot;@jdbc.username(a)&quot; connectionPassword=&quot;@jdbc.password(a)&quot; /> </Host> Modified: jbpm4/trunk/qa/build.xml =================================================================== --- jbpm4/trunk/qa/build.xml 2010-07-15 20:23:30 UTC (rev 6499) +++ jbpm4/trunk/qa/build.xml 2010-07-16 12:42:10 UTC (rev 6500) @@ -6,11 +6,11 @@ <property file="${user.home}/.jbpm4/build.properties" /> <fail message="property jbpm.parent.dir must be specified" unless="jbpm.parent.dir" /> + <fail message="property jbpm.version must be specified" unless="jbpm.version" /> <!-- CONFIGURABLE PROPERTIES --> <property name="database" value="hsqldb" /> <property name="identity.component" value="jbpm-built-in" /> - <property name="jbpm.version" value="4.4-SNAPSHOT" /> <!-- jbpm.home should not be configured. change jbpm.parent.dir instead --> <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> <property name="jboss.version" value="5.1.0.GA" /> @@ -47,7 +47,7 @@ <!-- ####################################### --> <!-- DB SETUP --> - <target name="testsuite.db.setup" depends="reinstall.jbpm"> + <target name="testsuite.db.setup" depends="reinstall.jbpm, install.hsqldb, start.hsqldb"> <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" /> <ant antfile="${jbpm.home}/install/build.xml" target="create.jbpm.schema" /> </target> @@ -55,6 +55,7 @@ <!-- DB TEARDOWN --> <target name="testsuite.db.teardown"> <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" /> + <antcall target="stop.hsqldb"/> </target> <!-- ################ --> @@ -65,8 +66,8 @@ <target name="testsuite.tomcat.setup" depends="reinstall.jbpm"> <ant antfile="${jbpm.home}/install/build.xml" target="reinstall.tomcat" /> <ant antfile="${jbpm.home}/install/build.xml" target="create.user.webapp" /> - <ant antfile="${jbpm.home}/install/build.xml" target="install.hsqldb.server" /> - <ant antfile="${jbpm.home}/install/build.xml" target="start.hsqldb.server" /> + <antcall target="install.hsqldb" /> + <antcall target="start.hsqldb" /> <ant antfile="${jbpm.home}/install/build.xml" target="create.jbpm.schema" /> <!-- to build the jbpm test webapp we start by copying the user webapp --> @@ -114,7 +115,7 @@ <target name="testsuite.tomcat.teardown"> <ant antfile="${jbpm.home}/install/build.xml" target="stop.tomcat" /> <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" /> - <ant antfile="${jbpm.home}/install/build.xml" target="stop.hsqldb.server" /> + <antcall target="stop.hsqldb" /> </target> <!-- ################ --> @@ -125,7 +126,7 @@ <target name="testsuite.jboss.setup" depends="internal.jboss.test.setup.base" description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema"> - <ant antfile="${jbpm.home}/install/build.xml" target="start.hsqldb.server" /> + <antcall target="start.hsqldb" /> <ant antfile="${jbpm.home}/install/build.xml" target="create.jbpm.schema" /> <ant antfile="${jbpm.home}/install/build.xml" target="start.jboss" /> </target> @@ -134,14 +135,14 @@ <target name="testsuite.jboss.teardown" description="drops the jbpm schema and stops jboss"> <ant antfile="${jbpm.home}/install/build.xml" target="stop.jboss" /> <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" /> - <ant antfile="${jbpm.home}/install/build.xml" target="stop.hsqldb.server" /> + <antcall target="stop.hsqldb" /> </target> <!-- JBOSS SETUP DEBUG --> <target name="testsuite.jboss.setup.for.debug" depends="internal.jboss.test.setup.base" description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema"> - <ant antfile="${jbpm.home}/install/build.xml" target="start.hsqldb.server" /> + <antcall target="start.hsqldb" /> <ant antfile="${jbpm.home}/install/build.xml" target="create.jbpm.schema" /> <ant antfile="${jbpm.home}/install/build.xml" target="enable.jboss.debug" /> </target> @@ -151,7 +152,7 @@ <ant antfile="${jbpm.home}/install/build.xml" target="reinstall.jboss" /> <ant antfile="${jbpm.home}/install/build.xml" target="install.jbpm.into.jboss" /> <ant antfile="${jbpm.home}/install/build.xml" target="create.user.webapp" /> - <ant antfile="${jbpm.home}/install/build.xml" target="install.hsqldb.server" /> + <antcall target="install.hsqldb" /> <!-- to build the jbpm test webapp we start by copying the user webapp --> <mkdir dir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war" /> @@ -200,7 +201,7 @@ <target name="testsuite.enterprise.setup" depends="internal.enterprise.test.setup.base" description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema"> - <ant antfile="${jbpm.home}/install/build.xml" target="start.hsqldb.server" /> + <antcall target="start.hsqldb" /> <ant antfile="${jbpm.home}/install/build.xml" target="create.jbpm.schema" /> <ant antfile="${jbpm.home}/install/build.xml" target="enable.jboss.debug" /> <ant antfile="${jbpm.home}/install/build.xml" target="start.jboss" /> @@ -211,20 +212,19 @@ description="drops the jbpm schema and stops jboss"> <ant antfile="${jbpm.home}/install/build.xml" target="stop.jboss" /> <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" /> - <ant antfile="${jbpm.home}/install/build.xml" target="stop.hsqldb.server" /> + <antcall target="stop.hsqldb" /> </target> <target name="testsuite.enterprise.setup.for.debug" depends="internal.enterprise.test.setup.base" description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema"> - <ant antfile="${jbpm.home}/install/build.xml" target="start.hsqldb.server" /> + <antcall target="start.hsqldb" /> <ant antfile="${jbpm.home}/install/build.xml" target="create.jbpm.schema" /> <ant antfile="${jbpm.home}/install/build.xml" target="enable.jboss.debug" /> </target> <target name="internal.enterprise.test.setup.base" - depends="internal.jboss.test.setup.base" - description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema"> + depends="internal.jboss.test.setup.base"> <!-- create the test queue --> <copy file="enterprise/jbpm-test-destinations-service.xml" todir="${jboss.home}/server/default/deploy/jbpm-test" /> @@ -273,7 +273,7 @@ <unzip dest="upgrade/target/jbpm-test-upgrade" src="upgrade/target/jbpm-test-upgrade.jar" /> <delete file="upgrade/target/jbpm-test-upgrade/hibernate.properties" /> - <ant antfile="${jbpm.home}/install/build.xml" target="install.hsqldb.server" /> + <antcall target="install.hsqldb" /> <antcall target="start.hsqldb" /> <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" /> @@ -318,6 +318,10 @@ <copy file="upgrade/target/ojdbc14.jar" todir="${jbpm.home}/lib" /> </target> + <target name="install.hsqldb" if="is.hsqldb"> + <ant antfile="${jbpm.home}/install/build.xml" target="install.hsqldb.server" /> + </target> + <target name="start.hsqldb" if="is.hsqldb"> <ant antfile="${jbpm.home}/install/build.xml" target="start.hsqldb.server" /> </target> Modified: jbpm4/trunk/qa/hudson-jbpm4-db.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-db.sh 2010-07-15 20:23:30 UTC (rev 6499) +++ jbpm4/trunk/qa/hudson-jbpm4-db.sh 2010-07-16 12:42:10 UTC (rev 6500) @@ -2,11 +2,16 @@ # # runs the database test suite +export MAVEN_OPTS="-Ddatabase=$DATABASE" + +JBPM_VERSION=`mvn -Dexpression=project.version help:evaluate | grep '^4\.'` +export ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Djbpm.version=$JBPM_VERSION $MAVEN_OPTS" + # build distribution -mvn -U -Pdistro clean install +mvn -q -U -Pdistro clean install # set up -ant -f qa/build.xml -Ddatabase=$DATABASE -Djbpm.parent.dir=$WORKSPACE testsuite.db.setup +ant -f qa/build.xml testsuite.db.setup # run test suite -mvn -Ddatabase=$DATABASE -Dmaven.test.failure.ignore=true test +mvn -Dmaven.test.failure.ignore=true test # tear down -ant -f qa/build.xml -Ddatabase=$DATABASE -Djbpm.parent.dir=$WORKSPACE testsuite.db.teardown +ant -f qa/build.xml testsuite.db.teardown Modified: jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh 2010-07-15 20:23:30 UTC (rev 6499) +++ jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh 2010-07-16 12:42:10 UTC (rev 6500) @@ -4,11 +4,12 @@ export MAVEN_OPTS="-Dbind.address=$JBOSS_BINDADDR" -export ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Dbind.address=$JBOSS_BINDADDR \ - -Djboss.distro.dir=$SOURCE_REPO/jboss -Djboss.version=$JBOSS_VERSION" +JBPM_VERSION=`mvn -Dexpression=project.version help:evaluate | grep '^4\.'` +export ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Djbpm.version=$JBPM_VERSION \ + -Djboss.distro.dir=$SOURCE_REPO/jboss -Djboss.version=$JBOSS_VERSION $MAVEN_OPTS" # build distribution -mvn -U -Pdistro,enterprise clean install +mvn -q -U -Pdistro,enterprise clean install # set up ant -f qa/build.xml testsuite.enterprise.setup # run test suite Modified: jbpm4/trunk/qa/hudson-jbpm4-jboss.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-jboss.sh 2010-07-15 20:23:30 UTC (rev 6499) +++ jbpm4/trunk/qa/hudson-jbpm4-jboss.sh 2010-07-16 12:42:10 UTC (rev 6500) @@ -4,11 +4,12 @@ export MAVEN_OPTS="-Dbind.address=$JBOSS_BINDADDR" -export ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Dbind.address=$JBOSS_BINDADDR \ - -Djboss.distro.dir=$SOURCE_REPO/jboss -Djboss.version=$JBOSS_VERSION" +JBPM_VERSION=`mvn -Dexpression=project.version help:evaluate | grep '^4\.'` +export ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Djbpm.version=$JBPM_VERSION \ + -Djboss.distro.dir=$SOURCE_REPO/jboss -Djboss.version=$JBOSS_VERSION $MAVEN_OPTS" # build distribution -mvn -U -Pdistro,integration clean install +mvn -q -U -Pdistro,integration clean install # set up ant -f qa/build.xml testsuite.jboss.setup # run test suite Modified: jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh 2010-07-15 20:23:30 UTC (rev 6499) +++ jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh 2010-07-16 12:42:10 UTC (rev 6500) @@ -4,11 +4,12 @@ export MAVEN_OPTS="-Dbind.address=$TOMCAT_BINDADDR" -export ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Dbind.address=$TOMCAT_BINDADDR \ - -Dtomcat.distro.dir=tomcat.downloads" +JBPM_VERSION=`mvn -Dexpression=project.version help:evaluate | grep '^4\.'` +export ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Djbpm.version=$JBPM_VERSION \ + -Dtomcat.distro.dir=tomcat.downloads $MAVEN_OPTS" # build distribution -mvn -U -Pdistro,integration clean install +mvn -q -U -Pdistro,integration clean install # set up ant -f qa/build.xml testsuite.tomcat.setup # run test suite Modified: jbpm4/trunk/qa/hudson-jbpm4-upgrade.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-upgrade.sh 2010-07-15 20:23:30 UTC (rev 6499) +++ jbpm4/trunk/qa/hudson-jbpm4-upgrade.sh 2010-07-16 12:42:10 UTC (rev 6500) @@ -2,14 +2,14 @@ # # runs the upgrade tests -export ANT_OPTS="-Dold.jbpm.version=$OLD_JBPM_VERSION -Ddatabase=$DATABASE \ - -Djbpm.parent.dir=$WORKSPACE" +export MAVEN_OPTS="-Dold.jbpm.version=$OLD_JBPM_VERSION -Ddatabase=$DATABASE" -export MAVEN_OPTS=$ANT_OPTS +JBPM_VERSION=`mvn -Dexpression=project.version help:evaluate | grep '^4\.'` +export ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Djbpm.version=$JBPM_VERSION $MAVEN_OPTS" # build distribution -mvn -f qa/upgrade/pom.xml dependency:copy -mvn -U -Pdistro,integration clean install +mvn -q -f qa/upgrade/pom.xml dependency:copy +mvn -q -U -Pdistro,integration clean install # set up ant -f qa/build.xml testsuite.upgrade.setup # run test suite