[jbpm-commits] JBoss JBPM SVN: r5534 - in jbpm4/trunk: modules/pvm/src/main/java/org/jbpm/pvm/internal/ant and 1 other directories.

[do-not-reply at jboss.org]

Author: jbarrez
Date: 2009-08-25 09:41:49 -0400 (Tue, 25 Aug 2009)
New Revision: 5534

Modified:
   jbpm4/trunk/modules/distro/src/main/files/install/build.xml
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java
   jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh
Log:
Fixed jBPM installation in Tomcat CI

Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-08-25 13:08:27 UTC (rev 5533)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-08-25 13:41:49 UTC (rev 5534)
@@ -297,25 +297,12 @@
   	<antcall target="install.tomcat.linuxandmac" />
   </target>
 
-	<target name="install.tomcat.linuxandmac" if="isLinuxOrMac">
-    <chmod perm="a+x" os="Linux, Mac OS X">
+	<target name="install.tomcat.linuxandmac" if="isLinuxUnixOrMac">
+	  <chmod perm="a+x" os="Linux, Mac OS X">
       <fileset dir="${tomcat.home}/bin">
         <include name="*.sh" />
       </fileset>
     </chmod>
-    <!-- see http://wiki.apache.org/tomcat/HowTo#head-b4cd273179175e013471674e1c2a6003dbd4f070 -->
-    <move file="${tomcat.home}/bin/setclasspath.sh" tofile="${tomcat.home}/bin/setclasspath-src.sh" />
-    <concat destfile="${tomcat.home}/bin/setclasspath.sh" >
-      <filelist dir="${tomcat.home}/bin" files="setclasspath-src.sh" />
-      <footer>
-BASEDIR=${tomcat.home}</footer>
-    </concat>
-    <move file="${tomcat.home}/bin/catalina.sh" tofile="${tomcat.home}/bin/catalina-src.sh" />
-    <concat destfile="${tomcat.home}/bin/catalina.sh" >
-      <filelist dir="${tomcat.home}/bin" files="catalina-src.sh" />
-      <footer>
-CATALINE_HOME=${tomcat.home}</footer>
-    </concat>
 	</target>
   
   <!-- ### GET TOMCAT ###################################################### -->
@@ -386,12 +373,12 @@
     <property name="is.tomcat" value="true" />
     <antcall target="internal.copy.database.driver" />
   </target>
+  	
 
   <!-- ### START TOMCAT ################################################### -->
   <target name="start.tomcat" 
           description="Starts Tomcat and waits till it is booted, then lets Tomcat run in the background">
-    <taskdef name="start-tomcat"
-             classname="org.jbpm.pvm.internal.ant.StartTomcatTask">
+    <taskdef name="start-tomcat" classname="org.jbpm.pvm.internal.ant.StartTomcatTask">
       <classpath>
         <fileset dir="${jbpm.home}">
           <include name="jbpm.jar" />

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java	2009-08-25 13:08:27 UTC (rev 5533)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java	2009-08-25 13:41:49 UTC (rev 5534)
@@ -50,6 +50,9 @@
       } else {
         throw new BuildException( "os '" + os + "' not supported in the start-tomcat task." );
       }
+      
+      // CATALINA_HOME MUST BE SET for tomcat to boot
+      System.setProperty("CATALINA_HOME", getTomcatHome());
 
       // launch the command and wait till the END_MESSAGE appears
       Thread launcher = new Launcher(this, command, END_MESSAGE, getTomcatHome()+fileSeparator+"bin");

Modified: jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh	2009-08-25 13:08:27 UTC (rev 5533)
+++ jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh	2009-08-25 13:41:49 UTC (rev 5534)
@@ -3,7 +3,6 @@
 # runs the jboss integration test suite
 
 MAVEN_OPTS="-Xms1024M -Xmx1024M"
-export CATALINA_HOME=`pwd`/jbpm-4.1-SNAPSHOT/apache-tomcat-6.0.20
 
 ANT_PROPERTIES="-Djbpm.parent.dir=$WORKSPACE -Djboss.distro.dir=$SOURCE_REPO/jboss -Dtomcat.distro.dir=tomcat.downloads"