[jbpm-commits] JBoss JBPM SVN: r5528 - in jbpm4/trunk: qa and 1 other directory.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-08-25 04:33:42 -0400 (Tue, 25 Aug 2009)
New Revision: 5528

Modified:
   jbpm4/trunk/modules/distro/src/main/files/install/build.xml
   jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh
Log:
another tomcat script launch debugging attempt: appending the env vars BASEDIR and CATALINE_HOME to the setclasspath.sh and catalina.sh respectively

Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-08-25 08:03:16 UTC (rev 5527)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-08-25 08:33:42 UTC (rev 5528)
@@ -288,12 +288,35 @@
           depends="get.tomcat"
           description="Downloads tomcat to ${tomcat.distro.dir} if its not available and then unzips tomcat">
     <unzip src="${tomcat.distro.path}" dest="${tomcat.parent.dir}" />
+  	<condition property="isLinuxOrMac">
+  		<or>
+        <os family="linux" />
+        <os family="mac" />
+  	  </or>
+  	</condition>
+  	<antcall target="install.tomcat.linuxandmac" />
+  </target>
+
+	<target name="install.tomcat.linuxandmac" if="isLinuxOrMac">
     <chmod perm="a+x" os="Linux, Mac OS X">
-    	<fileset dir="${tomcat.home}/bin">
-    		<include name="*.sh" />
+      <fileset dir="${tomcat.home}/bin">
+        <include name="*.sh" />
       </fileset>
     </chmod>
-  </target>
+    <!-- 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 ###################################################### -->
   <condition property="is.tomcat.distro.available">

Modified: jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh	2009-08-25 08:03:16 UTC (rev 5527)
+++ jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh	2009-08-25 08:33:42 UTC (rev 5528)
@@ -4,15 +4,14 @@
 
 MAVEN_OPTS="-Xms1024M -Xmx1024M"
 export CATALINA_HOME=`pwd`/jbpm-4.1-SNAPSHOT/apache-tomcat-6.0.20
-export BASEDIR=$CATALINA_HOME
 
 ANT_PROPERTIES="-Djbpm.parent.dir=$WORKSPACE -Djboss.distro.dir=$SOURCE_REPO/jboss -Dtomcat.distro.dir=tomcat.downloads" 
 
 mvn -U -Pdistro,integration clean install
 ant -f qa/build.xml $ANT_PROPERTIES tomcat.integration.testsuite.setup
 
-cd modules\test-cactus
+cd modules/test-cactus
 mvn -Pruntest test
-cd ..\..
+cd ../..
 
 ant -f qa/build.xml $ANT_PROPERTIES tomcat.integration.testsuite.teardown