jfarcand 2003/01/22 18:52:47
Modified: . build.xml
Log:
Oups..fix run-watchdog-security
Revision Changes Path
1.70 +4 -7 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- build.xml 23 Jan 2003 02:51:27 -0000 1.69
+++ build.xml 23 Jan 2003 02:52:47 -0000 1.70
@@ -532,17 +532,15 @@
prepare-watchdog" >
<parallel>
- <java classname="LauncherBootstrap" fork="yes">
+ <java classname="LauncherBootstrap" fork="yes">
<arg value="-launchfile"/>
<arg value="catalina.xml"/>
<arg value="-verbose"/>
<arg value="catalina"/>
- <arg value="-Dcatalina.base=${catalina.base}"/>
<arg value="start"/>
- <arg value="-security "/>
<classpath>
<pathelement path="${java.class.path}"/>
- <pathelement path="${tomcat.build}/bin"/>
+ <pathelement path="${catalina.build}/bin"/>
</classpath>
</java>
@@ -550,18 +548,17 @@
<!-- Let tomcat starts before starting Watchdog -->
<sleep seconds="60"/>
- <ant dir="${watchdog.home}/dist" target="all"/>
+ <ant dir="${watchdog.home}/dist" target="${watchdog.target}"/>
<java classname="LauncherBootstrap" fork="yes">
<arg value="-launchfile"/>
<arg value="catalina.xml"/>
<arg value="-verbose"/>
<arg value="catalina"/>
- <arg value="-Dcatalina.base=${catalina.base}"/>
<arg value="stop"/>
<classpath>
<pathelement path="${java.class.path}"/>
- <pathelement path="${tomcat.build}/bin"/>
+ <pathelement path="${catalina.build}/bin"/>
</classpath>
</java>
</sequential>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
