larryi 01/07/17 06:40:53
Modified: src/admin/test watchdog-jsp.jsp
Added: src/admin/WEB-INF/scripts watchdog-jsp.xml
Log:
Update watchdog-jsp.jsp to use a build script like watchdog-servlet.jsp.
This seems to help watchdog-jsp.jsp capture the output of the test in the
browser.
Revision Changes Path
1.1 jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-jsp.xml
Index: watchdog-jsp.xml
===================================================================
<project name="Watchdog-moo" default="main" basedir=".">
<property name="tomcat.home" value="../../../.."/>
<property name="ant-file"
value="${tomcat.home}/webapps/jsp-tests/WEB-INF/jsp-gtest.xml"/>
<property name="stests.home"
value="${tomcat.home}/webapps/jsp-tests"/>
<target name="main" >
<java classname="org.apache.tools.ant.Main"
fork="true" dir="../../../..">
<classpath>
<pathelement
path="../classes" />
<pathelement
path="../lib/ant.jar" />
<pathelement
path="${stests.home}/WEB-INF/classes" />
<pathelement
path="${tomcat.home}/lib/container/tomcat_util.jar" />
<pathelement
path="${tomcat.home}/lib/container/jaxp.jar" />
<pathelement
path="${tomcat.home}/lib/container/crimson.jar" />
</classpath>
<arg value="-Dwgdir" />
<arg value="${wgdir}" />
<arg value="-f" />
<arg value="${stests.home}/WEB-INF/jsp-gtest.xml" />
</java>
</target>
</project>
1.4 +2 -2 jakarta-tomcat/src/admin/test/watchdog-jsp.jsp
Index: watchdog-jsp.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/admin/test/watchdog-jsp.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- watchdog-jsp.jsp 2001/02/11 07:48:59 1.3
+++ watchdog-jsp.jsp 2001/07/17 13:40:52 1.4
@@ -18,8 +18,8 @@
<ant:ant>
<ant:target name="main" />
<ant:property name="ant.file"
- location="/WEB-INF/jsp-gtest.xml"
- webApp="/jsp-tests" />
+ location="/WEB-INF/scripts/watchdog-jsp.xml"
+ webApp="/admin" />
<ant:property name="wgdir"
location="/Golden"
webApp="/jsp-tests" />
