Author: thomas.diesler(a)jboss.com Date: 2008-08-27 10:43:43 -0400 (Wed, 27 Aug 2008) New Revision: 2033 Modified: jbpm3/trunk/.classpath jbpm3/trunk/.project jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/config.xml jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml Log: Dont append executot number Modified: jbpm3/trunk/.classpath =================================================================== --- jbpm3/trunk/.classpath 2008-08-27 13:03:34 UTC (rev 2032) +++ jbpm3/trunk/.classpath 2008-08-27 14:43:43 UTC (rev 2033) @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: jbpm3/trunk/.project =================================================================== --- jbpm3/trunk/.project 2008-08-27 13:03:34 UTC (rev 2032) +++ jbpm3/trunk/.project 2008-08-27 14:43:43 UTC (rev 2033) @@ -10,14 +10,8 @@ <arguments> </arguments> </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> </natures> </projectDescription> Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh 2008-08-27 13:03:34 UTC (rev 2032) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh 2008-08-27 14:43:43 UTC (rev 2033) @@ -4,7 +4,7 @@ JBPMDIR=$WORKSPACE/jbpm JBOSSDIR=$WORKSPACE/$CONTAINER DISTRODIR=$JBPMDIR/modules/distribution/target -JBOSS_BINDADDR=@jboss.bind.address(a)$EXECUTOR_NUMBER +JBOSS_BINDADDR=(a)jboss.bind.address@ case "$CONTAINER" in jboss421*) @@ -79,12 +79,12 @@ # # log dependency tree # -mvn dependency:tree | tee $WORKSPACE/dependency-tree.txt +mvn -Ddatabase=$DATABASE dependency:tree | tee $WORKSPACE/dependency-tree.txt # # execute tests # -mvn test 2>&1 | tee $WORKSPACE/tests.log +mvn -Ddatabase=$DATABASE test 2>&1 | tee $WORKSPACE/tests.log # cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt # cat $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$CONTAINER.txt Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/config.xml 2008-08-27 13:03:34 UTC (rev 2032) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/config.xml 2008-08-27 14:43:43 UTC (rev 2033) @@ -37,7 +37,8 @@ <axis> <name>database</name> <values> - <string>hypersonic</string> + <string>hsqldb</string> + <string>mysql</string> </values> </axis> <axis> @@ -57,7 +58,7 @@ # # call command.sh # -@hudson.home(a)/jobs/jBPM-Matrix/command.sh +@hudson.home(a)/jobs/jBPM-Matrix/command.sh </command> </hudson.tasks.Shell> </builders> Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2008-08-27 13:03:34 UTC (rev 2032) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2008-08-27 14:43:43 UTC (rev 2033) @@ -18,7 +18,7 @@ <hudson.model.StringParameterDefinition> <name>DATABASE</name> <optional>false</optional> - <defaultValue>hypersonic</defaultValue> + <defaultValue>hsqldb</defaultValue> </hudson.model.StringParameterDefinition> </parameterDefinitions> </hudson.model.ParametersDefinitionProperty> @@ -47,7 +47,7 @@ # # call command.sh # -@hudson.home(a)/jobs/jBPM-Matrix/command.sh +@hudson.home(a)/jobs/jBPM-Matrix/command.sh </command> </hudson.tasks.Shell> </builders> Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2008-08-27 13:03:34 UTC (rev 2032) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2008-08-27 14:43:43 UTC (rev 2033) @@ -18,7 +18,7 @@ <hudson.model.StringParameterDefinition> <name>DATABASE</name> <optional>false</optional> - <defaultValue>hypersonic</defaultValue> + <defaultValue>hsqldb</defaultValue> </hudson.model.StringParameterDefinition> </parameterDefinitions> </hudson.model.ParametersDefinitionProperty> @@ -47,7 +47,7 @@ # # call command.sh # -@hudson.home(a)/jobs/jBPM-Matrix/command.sh +@hudson.home(a)/jobs/jBPM-Matrix/command.sh </command> </hudson.tasks.Shell> </builders>