yoavs 2004/10/05 07:01:58
Modified: . build.properties.default build.xml
tester build.xml
tester/src/bin tester.xml
webapps/docs changelog.xml
Log:
Removed watchdog references.
Revision Changes Path
1.137 +2 -10 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- build.properties.default 16 Sep 2004 13:38:14 -0000 1.136
+++ build.properties.default 5 Oct 2004 14:01:52 -0000 1.137
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------------
-# build.properties.sample
+# build.properties.default
#
# This is an example "build.properties" file, used to customize building Tomcat
# for your local environment. It defines the location of all external
@@ -284,11 +284,3 @@
jsp-api.home=${base.path}/jsp-api-2.0
jsp-api.lib=${jsp-api.home}/lib
jsp-api.jar=${jsp-api.lib}/jsp-api.jar
-
-
-# ----- Watchdog, version 20020801 or later -----
-watchdog.home=${base.path}/jakarta-watchdog-4.0
-watchdog.webapps=${watchdog.home}/dist/webapps
-watchdog.war=${watchdog.webapps}/servlet-tests.war
-watchdog.loc=jakarta-watchdog-4.0
-watchdog.target=all
1.218 +0 -113 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- build.xml 4 Oct 2004 21:35:18 -0000 1.217
+++ build.xml 5 Oct 2004 14:01:57 -0000 1.218
@@ -1160,119 +1160,6 @@
</target>
- <!-- ======================= WATCHDOG: Run Watchdog Tests================ -->
-
- <target name="dist-watchdog" depends="proxyflags"
- description="Build watchdog">
-
- <cvs cvsRoot="${cvsroot}"
- package="${watchdog.loc}"
- dest="${base.path}"
- />
-
- <mkdir dir="${watchdog.home}/tmp"/>
-
- <unjar dest="${watchdog.home}/tmp"
src="${servlet-api.home}/lib/servlet-api.jar"/>
- <unjar dest="${watchdog.home}/tmp" src="${jsp-api.home}/lib/jsp-api.jar"/>
-
- <jar destfile="${watchdog.home}/servlet.jar"
- basedir="${watchdog.home}/tmp"
- />
-
- <replace file="${watchdog.home}/build.xml"
- token="$${servlet23api.home}/lib/servlet.jar"
- value="${watchdog.home}/servlet.jar"/>
-
- <replace file="${watchdog.home}/build.xml"
- token="$${servlet22api.home}/lib/servlet.jar"
- value="${watchdog.home}/servlet.jar"/>
-
- <ant dir="${watchdog.home}" target="dist" inheritAll="false"/>
- </target>
-
- <target name="prepare-watchdog">
- <copy todir="${tomcat.build}/webapps">
- <fileset dir="${watchdog.home}/dist/webapps"/>
- </copy>
- </target>
-
- <target name="run-watchdog"
- description="Watchdog Servlet Container Tests" depends="dist-watchdog,
- prepare-watchdog">
- <parallel>
- <java classname="LauncherBootstrap" fork="yes">
- <arg value="-launchfile"/>
- <arg value="catalina.xml"/>
- <arg value="-verbose"/>
- <arg value="catalina"/>
- <arg value="start"/>
- <classpath>
- <pathelement path="${java.class.path}"/>
- <pathelement path="${tomcat.build}/bin"/>
- </classpath>
- </java>
-
- <sequential>
- <!-- Let tomcat starts before starting Watchdog -->
- <sleep seconds="15"/>
-
- <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="stop"/>
- <classpath>
- <pathelement path="${java.class.path}"/>
- <pathelement path="${tomcat.build}/bin"/>
- </classpath>
- </java>
- </sequential>
- </parallel>
-
- </target>
-
- <target name="run-watchdog-security"
- description="Watchdog Servlet Container Tests" depends="dist-watchdog,
- prepare-watchdog" >
-
- <parallel>
- <java classname="LauncherBootstrap" fork="yes">
- <arg value="-launchfile"/>
- <arg value="catalina.xml"/>
- <arg value="-verbose"/>
- <arg value="catalina"/>
- <arg value="start"/>
- <classpath>
- <pathelement path="${java.class.path}"/>
- <pathelement path="${tomcat.build}/bin"/>
- </classpath>
- </java>
-
- <sequential>
- <!-- Let tomcat starts before starting Watchdog -->
- <sleep seconds="60"/>
-
- <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="stop"/>
- <classpath>
- <pathelement path="${java.class.path}"/>
- <pathelement path="${tomcat.build}/bin"/>
- </classpath>
- </java>
- </sequential>
- </parallel>
-
- </target>
-
<!-- ====================== DIST: Create Directories ==================== -->
<target name="dist-prepare">
<mkdir dir="${tomcat.dist}"/>
1.8 +1 -1 jakarta-tomcat-catalina/tester/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/tester/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 29 Aug 2004 18:13:28 -0000 1.7
+++ build.xml 5 Oct 2004 14:01:58 -0000 1.8
@@ -119,7 +119,7 @@
version="true"
windowtitle="Tester Internal API Documentation"
doctitle="Tester Tools and Tests API"
- bottom="Copyright © 2000 Apache Software Foundation. All Rights
Reserved."
+ bottom="Copyright © 2000-2004 Apache Software Foundation. All Rights
Reserved."
/>
</target>
1.11 +0 -3 jakarta-tomcat-catalina/tester/src/bin/tester.xml
Index: tester.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/tester/src/bin/tester.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tester.xml 30 Mar 2004 12:34:42 -0000 1.10
+++ tester.xml 5 Oct 2004 14:01:58 -0000 1.11
@@ -1516,9 +1516,6 @@
<!-- ========== Other ServletRequest Tests ============================ -->
- <!-- Servlet compliance tests, until equivalent tests are included
- in jakarta-watchdog-4.0. -->
-
<!-- HttpURLConnection does not handle multiple headers for the same
name correctly, so use native socket connections, selected by
setting the protocol to "HTTP/1.0" -->
1.134 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- changelog.xml 5 Oct 2004 07:56:49 -0000 1.133
+++ changelog.xml 5 Oct 2004 14:01:58 -0000 1.134
@@ -131,6 +131,9 @@
<fix>
Enable Connector.findLifecycleListener that we can listen start/stop
Connector events and save the listener to xml. (pero)
</fix>
+ <update>
+ Remove Watchdog references, as it is no longer used. (yoavs)
+ </update>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
