Author: alex.guizar(a)jboss.com Date: 2010-08-10 06:11:34 -0400 (Tue, 10 Aug 2010) New Revision: 6560 Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.jndi.properties Log: JBPM-2916 provide udp multicast address; separate naming provider urls with comma instead of space Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-08-10 09:42:10 UTC (rev 6559) +++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-08-10 10:11:34 UTC (rev 6560) @@ -9,7 +9,8 @@ # JAVA_15_HOME required if testing against java 1.4 only # DATABASE db2, hsqldb, mssql, mysql, oracle, postgresql # CONTAINER jboss405, jboss423, jboss501, jboss510 -# JBOSS_BINDADDR jboss bind address +# MYTESTIP_1 bind address +# MCASTIP multicast address # JOB_NAME used as unique jgroups partition name # SOURCE_REPO location of jboss distributions # @@ -68,7 +69,7 @@ # # Build distro # -mvn -Pdistro,soa -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION -Dcontainer=$CONTAINER \ +mvn -Pdistro -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION -Dcontainer=$CONTAINER \ -Djboss.home=$JBOSS_HOME -Djboss.server=$JBOSS_SERVER clean install if [ $? -ne 0 ]; then echo "ERROR: failed to build distro" @@ -79,7 +80,11 @@ # Install distro # $JAVA -jar modules/distribution/target/jbpm-distribution-$JBPM_VERSION-installer.jar \ - modules/distribution/target/resources/auto-install-template.xml + modules/distribution/target/classes/auto-install-template.xml +if [ $? -ne 0 ]; then + echo "ERROR: failed to install distro" + exit 1 +fi # # Install proprietary JDBC drivers @@ -140,27 +145,27 @@ # Start JBoss AS # export JAVA_HOME=$ORIG_JAVA_HOME -$JBOSS_HOME/bin/run.sh -b $JBOSS_BINDADDR -c $JBOSS_SERVER -g $JOB_NAME &> /dev/null & +$JBOSS_HOME/bin/run.sh -b $MYTESTIP_1 -c $JBOSS_SERVER -g $JOB_NAME -u $MCASTIP &> /dev/null & # Was it successfully started? -wget --spider --retry-connrefused --waitretry=24 --no-verbose $JBOSS_BINDADDR:8080 +wget --spider --retry-connrefused --waitretry=24 --no-verbose $MYTESTIP_1:8080 if [ $? -ne 0 ]; then tail -n 100 $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log - $JBOSS_HOME/bin/shutdown.sh -s jnp://$JBOSS_BINDADDR:1099 -S + $JBOSS_HOME/bin/shutdown.sh -s jnp://$MYTESTIP_1:1099 -S exit 1 fi # # Execute tests # -mvn --fail-at-end -Djboss.bind.address=$JBOSS_BINDADDR -Dsurefire.jvm.args="-Xms64m -Xmx256m" \ +mvn --fail-at-end -Djboss.bind.address=$MYTESTIP_1 -Dsurefire.jvm.args="-Xms64m -Xmx256m" \ test | tee $WORKSPACE/tests.log -grep -E 'FIXME\|FAILED' $WORKSPACE/tests.log | sort -u | tee $WORKSPACE/fixme.txt +grep -E 'FIXME\|FAILED' $WORKSPACE/tests.log | sort -u > $WORKSPACE/fixme.txt grep -E '\[\S*]' $WORKSPACE/fixme.txt > $WORKSPACE/errata-$CONTAINER.txt # # Stop JBoss AS # -$JBOSS_HOME/bin/shutdown.sh -s jnp://$JBOSS_BINDADDR:1099 -S +$JBOSS_HOME/bin/shutdown.sh -s jnp://$MYTESTIP_1:1099 -S ln -sf $JBOSS_HOME/server/$JBOSS_SERVER/log/boot.log $WORKSPACE ln -sf $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log $WORKSPACE Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.jndi.properties =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.jndi.properties 2010-08-10 09:42:10 UTC (rev 6559) +++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.jndi.properties 2010-08-10 10:11:34 UTC (rev 6560) @@ -1,2 +1,2 @@ -java.naming.provider.url=jnp://${jboss.bind.address}:1100 jnp://${jboss.bind.address} +java.naming.provider.url=jnp://${jboss.bind.address}:1100,jnp://${jboss.bind.address} jnp.partitionName=${jboss.partition.name}