vmassol 2002/08/03 11:02:11
Modified: sample-servlet build.xml
sample-servlet/conf/sample/build/share
build-tests-tomcat-40.xml
Log:
fix for Gump - Provided by Sam Ruby
Revision Changes Path
1.12 +5 -0 jakarta-cactus/sample-servlet/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 30 Jul 2002 20:17:19 -0000 1.11
+++ build.xml 3 Aug 2002 18:02:10 -0000 1.12
@@ -364,6 +364,11 @@
failonerror="yes">
<!-- Pass all required properties -->
+
+ <!-- Inherit the classpath behaviour from the main script for
+ Gump builds to work -->
+ <arg value="-Dbuild.sysclasspath=${build.sysclasspath}"/>
+
<arg value="-Dservlet.jar=${j2ee.jar}"/>
<arg value="-Dcactus.framework.jar=${cactus.framework.elected.jar}"/>
<arg value="-Dcactus.ant.jar=${cactus.ant.jar}"/>
1.4 +3 -12
jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-tomcat-40.xml
Index: build-tests-tomcat-40.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-tomcat-40.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-tests-tomcat-40.xml 22 Jul 2002 18:40:20 -0000 1.3
+++ build-tests-tomcat-40.xml 3 Aug 2002 18:02:11 -0000 1.4
@@ -39,11 +39,6 @@
<include name="bin/bootstrap.jar"/>
</fileset>
- <!-- This is to allow the use of -Dbuild.sysclasspath=only when
- starting Ant - Meaning that all jars need to be on the
- initial classpath. -->
- <pathelement path="${java.class.path}"/>
-
</classpath>
</java>
@@ -60,14 +55,10 @@
<jvmarg value="-Dcatalina.home=${tomcat.home.40}"/>
<jvmarg value="-Dcatalina.base=${target.tomcat40.dir}"/>
<arg value="stop"/>
- <classpath>
- <!-- This is to allow the use of -Dbuild.sysclasspath=only when
- starting Ant - Meaning that all jars need to be on the
- initial classpath -->
- <pathelement path="${java.class.path}"/>
-
- <!-- These are ignored if -Dbuild.sysclasspath=only is used -->
+ <classpath>
+ <!-- These are ignored if -Dbuild.sysclasspath=only is used
+ (this is the case for Gump builds) -->
<fileset dir="${tomcat.home.40}">
<include name="bin/bootstrap.jar"/>
</fileset>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
