[jbpm-commits] JBoss JBPM SVN: r2077 - in jbpm3/trunk/hudson: hudson-home and 4 other directories.

[do-not-reply at jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-09-03 04:07:29 -0400 (Wed, 03 Sep 2008)
New Revision: 2077

Modified:
   jbpm3/trunk/hudson/build.xml
   jbpm3/trunk/hudson/hudson-home/command.sh
   jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml
   jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-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:
Use command.sh from jbpm workspace

Modified: jbpm3/trunk/hudson/build.xml
===================================================================
--- jbpm3/trunk/hudson/build.xml	2008-09-03 07:51:41 UTC (rev 2076)
+++ jbpm3/trunk/hudson/build.xml	2008-09-03 08:07:29 UTC (rev 2077)
@@ -137,8 +137,8 @@
       </fileset>
       <filterset>
         <filter token="hudson.jbpm.url" value="${hudson.jbpm.url}"/>
+        <filter token="hudson.base" value="${hudson.base}"/>
         <filter token="hudson.home" value="${hudson.home}"/>
-        <filter token="hudson.root" value="${hudson.root}"/>
         <filter token="version.id" value="${version.id}"/>
         <filtersfile file="${hudson.dir}/ant.properties"/>
       </filterset>

Modified: jbpm3/trunk/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/trunk/hudson/hudson-home/command.sh	2008-09-03 07:51:41 UTC (rev 2076)
+++ jbpm3/trunk/hudson/hudson-home/command.sh	2008-09-03 08:07:29 UTC (rev 2077)
@@ -22,7 +22,7 @@
 # Unzip the JBoss build
 #
 rm -rf $JBOSS_BUILD
-unzip -q $HUDSON_HOME/jboss/$JBOSS_BUILD.zip
+unzip -q $HUDSON_BASE/jboss/$JBOSS_BUILD.zip
 
 JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD
 ENVIRONMENT="-Djboss.bind.address=$JBOSS_BINDADDR -Djboss.home=$JBOSS_HOME"

Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml	2008-09-03 07:51:41 UTC (rev 2076)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml	2008-09-03 08:07:29 UTC (rev 2077)
@@ -57,7 +57,8 @@
 
 export CONTAINER=$container
 export DATABASE=$database
-export HUDSON_HOME=@hudson.home@
+
+export HUDSON_BASE=@hudson.base@
 export JBPM_VERSION=@version.id@
 export JBOSS_SERVER=@jboss.server.instance@
 export JBOSS_BINDADDR=@jboss.bind.address@
@@ -65,7 +66,7 @@
 #
 # call command.sh 
 #
-$JBPMDIR/hudson/hudson-home/command.sh
+/bin/sh $JBPMDIR/hudson/hudson-home/command.sh
       </command>
     </hudson.tasks.Shell>
   </builders>

Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml	2008-09-03 07:51:41 UTC (rev 2076)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml	2008-09-03 08:07:29 UTC (rev 2077)
@@ -57,7 +57,8 @@
 
 export CONTAINER=$container
 export DATABASE=$database
-export HUDSON_HOME=@hudson.home@
+
+export HUDSON_BASE=@hudson.base@
 export JBPM_VERSION=@version.id@
 export JBOSS_SERVER=@jboss.server.instance@
 export JBOSS_BINDADDR=@jboss.bind.address@
@@ -65,7 +66,7 @@
 #
 # call command.sh 
 #
-$JBPMDIR/hudson/hudson-home/command.sh
+/bin/sh $JBPMDIR/hudson/hudson-home/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-09-03 07:51:41 UTC (rev 2076)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml	2008-09-03 08:07:29 UTC (rev 2077)
@@ -47,7 +47,7 @@
 WORKSPACE=`pwd`
 JBPMDIR=$WORKSPACE/jbpm
 
-export HUDSON_HOME=@hudson.home@
+export HUDSON_BASE=@hudson.base@
 export JBPM_VERSION=@version.id@
 export JBOSS_SERVER=@jboss.server.instance@
 export JBOSS_BINDADDR=@jboss.bind.address@
@@ -55,7 +55,7 @@
 #
 # call command.sh 
 #
-$JBPMDIR/hudson/hudson-home/command.sh
+/bin/sh $JBPMDIR/hudson/hudson-home/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-09-03 07:51:41 UTC (rev 2076)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml	2008-09-03 08:07:29 UTC (rev 2077)
@@ -47,7 +47,7 @@
 WORKSPACE=`pwd`
 JBPMDIR=$WORKSPACE/jbpm
 
-export HUDSON_HOME=@hudson.home@
+export HUDSON_BASE=@hudson.base@
 export JBPM_VERSION=@version.id@
 export JBOSS_SERVER=@jboss.server.instance@
 export JBOSS_BINDADDR=@jboss.bind.address@
@@ -55,7 +55,7 @@
 #
 # call command.sh 
 #
-$JBPMDIR/hudson/hudson-home/command.sh
+/bin/sh $JBPMDIR/hudson/hudson-home/command.sh
       </command>
     </hudson.tasks.Shell>
   </builders>