jfarcand 2003/01/22 18:51:27
Modified: . build.xml build.properties.default
Log:
Re-arrange the watchdog target (was broken). Rename the target run-watchdog. This
target will checkout watchdog,
compile it, start Tomcat, deploy watchdog and run the test. In build.properties, it
is possible to c
onfigure the watchdog target (servlet, jsp or all).
The new target are: dist-watchdog, run-watchdog and run-watchdog-security
No reason to not run it before making a critical change :-)
Revision Changes Path
1.69 +110 -72 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- build.xml 22 Jan 2003 10:23:22 -0000 1.68
+++ build.xml 23 Jan 2003 02:51:27 -0000 1.69
@@ -44,7 +44,8 @@
<property name="jasper.build" value="${jasper.home}/build"/>
<property name="javaservice.home" value="../javaservice"/>
<property name="nsis.home" value="c:\program files\nsis"/>
- <property name="servlet.home" value="../jakarta-servletapi-4/dist"/>
+ <property name="servlet.home" value="../jakarta-servletapi-5/jsr154/dist"/>
+ <property name="jsp.home" value="../jakarta-servletapi-5/jsr152/dist"/>
<property name="tomcat.build" value="${basedir}/build"/>
<property name="tomcat.dist" value="${basedir}/dist"/>
<property name="tomcat.release" value="${basedir}/release"/>
@@ -453,66 +454,120 @@
</target>
<!-- ======================= WATCHDOG: Run Watchdog Tests================ -->
- <target name="watchdog"
- description="Watchdog Servlet Container Tests">
- <property name="catalina.base" location="${tomcat.build}/tmp/tomcat"/>
- <delete dir="${catalina.base}"/>
- <mkdir dir="${catalina.base}"/>
- <copy todir="${catalina.base}/conf">
- <fileset dir="${tomcat.build}/conf"/>
- </copy>
- <copy todir="${catalina.base}/webapps">
- <fileset dir="${tomcat.build}/webapps"/>
- </copy>
- <copy todir="${catalina.base}/work">
- <fileset dir="${tomcat.build}/work"/>
- </copy>
- <copy todir="${catalina.base}/logs">
- <fileset dir="${tomcat.build}/logs"/>
- </copy>
- <copy todir="${catalina.base}/server/webapps">
- <fileset dir="${tomcat.build}/server/webapps"/>
- </copy>
- <copy todir="${catalina.base}/temp">
- <fileset dir="${tomcat.build}/temp"/>
- </copy>
- <copy todir="${catalina.base}/webapps">
- <fileset dir="${watchdog.home}/dist/webapps"/>
- </copy>
+
+ <target name="dist-watchdog" depends="proxyflags"
+ description="Download Watchdog binary">
- <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"/>
- <classpath>
- <pathelement path="${java.class.path}"/>
- <pathelement path="${tomcat.build}/bin"/>
- </classpath>
- </java>
+ <cvs cvsRoot="${cvsroot}"
+ package="${watchdog.loc}"
+ dest="${base.path}"
+ />
+
+ <mkdir dir="${watchdog.home}/tmp"/>
- <sleep seconds="60"/>
+ <unjar dest="${watchdog.home}/tmp" src="${servlet.home}/lib/servlet-api.jar"/>
+ <unjar dest="${watchdog.home}/tmp" src="${jsp.home}/lib/jsp-api.jar"/>
- <ant dir="${watchdog.home}/dist" target="all"/>
-
- <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"/>
- </classpath>
- </java>
+ <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="${catalina.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="${catalina.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="${catalina.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="-Dcatalina.base=${catalina.base}"/>
+ <arg value="start"/>
+ <arg value="-security "/>
+ <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="all"/>
+
+ <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"/>
+ </classpath>
+ </java>
+ </sequential>
+ </parallel>
+
+ </target>
<!-- ====================== DIST: Create Directories ==================== -->
<target name="dist-prepare">
<mkdir dir="${tomcat.dist}"/>
@@ -969,23 +1024,6 @@
<param name="sourcefile" value="${tyrex.loc}"/>
<param name="destfile" value="${tyrex.jar}"/>
<param name="destdir" value="${tyrex.home}"/>
- </antcall>
-
- </target>
-
- <target name="download.watchdog" depends="proxyflags"
- description="Download Watchdog binary">
-
- <antcall target="cvsbuild">
- <param name="location" value="${servlet23api.loc}"/>
- <param name="subdir" value="${servlet23api.home}"/>
- <param name="destfile" value="${servlet23api.jar}"/>
- </antcall>
- <antcall target="cvsbuild">
- <param name="servlet22api.home" value="${servlet23api.home}"/>
- <param name="location" value="${watchdog.loc}"/>
- <param name="subdir" value="${watchdog.home}"/>
- <param name="destfile" value="${watchdog.war}"/>
</antcall>
</target>
1.58 +3 -2 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- build.properties.default 17 Jan 2003 20:30:30 -0000 1.57
+++ build.properties.default 23 Jan 2003 02:51:27 -0000 1.58
@@ -267,7 +267,8 @@
# ----- Watchdog, version 20020801 or later -----
-watchdog.home=${base.path}/watchdog-4.0
+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
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
