larryi 2004/02/19 19:55:03
Modified: . build.xml
src/admin/WEB-INF/scripts watchdog-jsp.xml
watchdog-servlet.xml
src/admin/test sanity-form.jsp
Log:
Update admin webapp to be able run self tests when built with Ant 1.6.
Revision Changes Path
1.201 +4 -0 jakarta-tomcat/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- build.xml 6 Feb 2004 03:37:20 -0000 1.200
+++ build.xml 20 Feb 2004 03:55:03 -0000 1.201
@@ -60,6 +60,7 @@
<property name="ant.bin" location="${ant.home}/bin"/>
<property name="ant.lib" location="${ant.home}/lib"/>
<property name="ant.jar" location="${ant.home}/lib/ant.jar"/>
+ <property name="ant-launcher.jar" location="${ant.home}/lib/ant-launcher.jar"/>
<property name="optional.jar" location="${ant.home}/lib/optional.jar"/>
<property name="ant-optional.jar" location="${ant.home}/lib/ant-optional.jar"/>
@@ -837,11 +838,14 @@
</copy>
<copy tofile="${tomcat.build}/webapps/admin/WEB-INF/lib/ant.jar"
file="${ant.jar}"/>
+ <copy tofile="${tomcat.build}/webapps/admin/WEB-INF/lib/ant-launcher.jar"
+ file="${ant-launcher.jar}"/>
<jar jarfile="${tomcat.build}/webapps/admin/WEB-INF/lib/tomcat_util_test.jar"
basedir="${tomcat.build}/classes">
<include name="org/apache/tomcat/util/**"/>
</jar>
<javac srcdir="src/admin/WEB-INF/classes"
+ debug="${debug}"
optimize="${optimize}"
destdir="${tomcat.build}/webapps/admin/WEB-INF/classes">
<classpath>
1.3 +2 -0 jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-jsp.xml
Index: watchdog-jsp.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-jsp.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- watchdog-jsp.xml 22 Sep 2001 02:53:51 -0000 1.2
+++ watchdog-jsp.xml 20 Feb 2004 03:55:03 -0000 1.3
@@ -16,6 +16,8 @@
<pathelement
path="../lib/ant.jar" />
<pathelement
+ path="../lib/ant-launcher.jar" />
+ <pathelement
path="${stests.home}/WEB-INF/classes" />
<pathelement
path="${tomcat.home}/webapps/admin/WEB-INF/lib/tomcat_util_test.jar" />
1.7 +2 -0 jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-servlet.xml
Index: watchdog-servlet.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-servlet.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- watchdog-servlet.xml 17 Jul 2001 13:36:49 -0000 1.6
+++ watchdog-servlet.xml 20 Feb 2004 03:55:03 -0000 1.7
@@ -16,6 +16,8 @@
<pathelement
path="../lib/ant.jar" />
<pathelement
+ path="../lib/ant-launcher.jar" />
+ <pathelement
path="${stests.home}/WEB-INF/classes" />
<pathelement
path="${tomcat.home}/lib/container/jaxp.jar" />
1.8 +3 -3 jakarta-tomcat/src/admin/test/sanity-form.jsp
Index: sanity-form.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/admin/test/sanity-form.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sanity-form.jsp 13 Jan 2002 03:32:01 -0000 1.7
+++ sanity-form.jsp 20 Feb 2004 03:55:03 -0000 1.8
@@ -29,7 +29,7 @@
curPort = String.valueOf(request.getServerPort());
String curProto = request.getParameter("server.proto");
if ( curProto == null )
- curProto = "HTTP/1.0";
+ curProto = "HTTP/1.1";
String webServer = request.getParameter("web.server");
if ( webServer == null )
webServer = "Tomcat";
@@ -58,8 +58,8 @@
<tr><td valign="top">Expected protocol:</td>
<td valign="top"><select name="server.proto" >
<% listOptions(protocols, curProto, out); %></select></td>
- <td valign="top">Specify HTTP/1.0 for Tomcat as the host web server<br>
- Specify HTTP/1.1 for others.</td></tr>
+ <td valign="top">Specify HTTP/1.0 for Tomcat when using deprecated HTTP 1.0
connector.<br>
+ Specify HTTP/1.1 for Tomcat with new HTTP 1.1 connector and for other
servers.</td></tr>
<tr><td valign="top">Static Page Server: </td>
<td valign="top"><select name="static.server" >
<% listOptions(webservers, staticServer, out); %></select></td>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
