cvs commit: jakarta-tomcat/src/admin/test sanity-form.jsp test.jsp watchdog-jsp.jsp watchdog-servlet.jsp
billbarker2004/02/22 13:58:41 Modified:src/admin/test sanity-form.jsp test.jsp watchdog-jsp.jsp watchdog-servlet.jsp Log: Updating to Apache License v2.0. Revision ChangesPath 1.9 +15 -0 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.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sanity-form.jsp 20 Feb 2004 03:55:03 - 1.8 +++ sanity-form.jsp 22 Feb 2004 21:58:41 - 1.9 @@ -1,3 +1,18 @@ + <%! void listOptions(String[] opts, String sel, JspWriter out) 1.20 +18 -1 jakarta-tomcat/src/admin/test/test.jsp Index: test.jsp === RCS file: /home/cvs/jakarta-tomcat/src/admin/test/test.jsp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- test.jsp 31 Dec 2001 21:46:16 - 1.19 +++ test.jsp 22 Feb 2004 21:58:41 - 1.20 @@ -1,4 +1,21 @@ -Tomcat Self-Test + + +Tomcat Self-Test + Tomcat Self-test <%@ page import="java.util.*" %> 1.5 +15 -0 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- watchdog-jsp.jsp 17 Jul 2001 13:40:52 - 1.4 +++ watchdog-jsp.jsp 22 Feb 2004 21:58:41 - 1.5 @@ -1,3 +1,18 @@ + Tomcat Self-test <%@ taglib uri="http://jakarta.apache.org/taglibs/tomcat_admin-1.0"; 1.3 +15 -0 jakarta-tomcat/src/admin/test/watchdog-servlet.jsp Index: watchdog-servlet.jsp === RCS file: /home/cvs/jakarta-tomcat/src/admin/test/watchdog-servlet.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- watchdog-servlet.jsp 1 Feb 2001 04:43:48 - 1.2 +++ watchdog-servlet.jsp 22 Feb 2004 21:58:41 - 1.3 @@ -1,3 +1,18 @@ + Tomcat Self-test <%@ taglib uri="http://jakarta.apache.org/taglibs/tomcat_admin-1.0"; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/admin/test sanity-form.jsp
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 ChangesPath
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 - 1.200
+++ build.xml 20 Feb 2004 03:55:03 - 1.201
@@ -60,6 +60,7 @@
+
@@ -837,11 +838,14 @@
+
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 - 1.2
+++ watchdog-jsp.xml 20 Feb 2004 03:55:03 - 1.3
@@ -16,6 +16,8 @@
+
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 - 1.6
+++ watchdog-servlet.xml 20 Feb 2004 03:55:03 - 1.7
@@ -16,6 +16,8 @@
+
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 - 1.7
+++ sanity-form.jsp 20 Feb 2004 03:55:03 - 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 @@
Expected protocol:
<% listOptions(protocols, curProto, out); %>
-Specify HTTP/1.0 for Tomcat as the host web server
-Specify HTTP/1.1 for others.
+Specify HTTP/1.0 for Tomcat when using deprecated HTTP 1.0
connector.
+Specify HTTP/1.1 for Tomcat with new HTTP 1.1 connector and for other
servers.
Static Page Server:
<% listOptions(webservers, staticServer, out); %>
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/admin/test sanity-form.jsp
larryi 02/01/12 19:32:01
Modified:src/admin/test sanity-form.jsp
Log:
Keep port setting from run to run. Default to getServerPort() if parameter
not present.
Revision ChangesPath
1.7 +4 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sanity-form.jsp 9 Jan 2002 06:37:13 - 1.6
+++ sanity-form.jsp 13 Jan 2002 03:32:01 - 1.7
@@ -24,6 +24,9 @@
String curTarget = request.getParameter("target");
if (curTarget == null)
curTarget = "client";
+ String curPort = request.getParameter("port");
+ if (curPort == null)
+ curPort = String.valueOf(request.getServerPort());
String curProto = request.getParameter("server.proto");
if ( curProto == null )
curProto = "HTTP/1.0";
@@ -49,7 +52,7 @@
The host web server to test.
Host HTTP Port:
+value="<%= curPort %>" size="10">
HTTP port being used by the host web server.
Specify 8080 for Tomcat and 80 for others.
Expected protocol:
--
To unsubscribe, e-mail:
For additional commands, e-mail:
cvs commit: jakarta-tomcat/src/admin/test sanity-form.jsp
larryi 02/01/08 22:37:13
Modified:src/admin/test sanity-form.jsp
Log:
Add new "dos_devices" test to the list.
Revision ChangesPath
1.6 +1 -1 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sanity-form.jsp 31 Dec 2001 21:46:16 - 1.5
+++ sanity-form.jsp 9 Jan 2002 06:37:13 - 1.6
@@ -14,7 +14,7 @@
"file","params","dispatch","get","requestMap","post",
"wrong_request","restricted","jsp","unavailable",
"headers","enc","security_chk_url","security_chk",
- "aaa","special","client"};
+ "dos_devices","aaa","special","client"};
String [] protocols = new String [] {
"HTTP/1.0","HTTP/1.1"};
String [] webservers = new String [] {
--
To unsubscribe, e-mail:
For additional commands, e-mail:
cvs commit: jakarta-tomcat/src/admin/test sanity-form.jsp
larryi 01/07/18 13:39:40 Modified:src/admin/test sanity-form.jsp Log: Add missing tests to the list Revision ChangesPath 1.4 +5 -1 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sanity-form.jsp 2001/02/10 19:08:15 1.3 +++ sanity-form.jsp 2001/07/18 20:39:40 1.4 @@ -8,9 +8,13 @@ requestMap post wrong_request - unavailable restricted jsp + unavailable + headers + security_chk_url + security_chk + aaa special tomcat-standalone tomcat-apache
cvs commit: jakarta-tomcat/src/admin/test sanity-form.jsp
costin 01/02/10 11:08:15 Modified:src/admin index.html src/admin/test sanity-form.jsp Log: - Added a link to the test pages. - added a short note about what to do in order to enable /admin - small change in the test form. XXX missing: an index.html in /admin/test with links to the "sanity" test and the web-based watchdog runner. Revision ChangesPath 1.3 +54 -0 jakarta-tomcat/src/admin/index.html Index: index.html === RCS file: /home/cvs/jakarta-tomcat/src/admin/index.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.html2000/12/27 21:41:23 1.2 +++ index.html2001/02/10 19:08:14 1.3 @@ -31,7 +31,61 @@ Modules Context Admin Snoop + Test applications + +IMPORTANT: In order to run the /admin applications you need to +"trust it" and set a password. The /admin may be dangerous +if left unprotected, and is disabled by default. + +To enable the /admin you'll need to edit the file +TOMCAT_HOME/conf/apps-admin.xml and change the "trusted" attribute +to true. It should look like: + ++ + + + +You can also do that by running the command: + +Unix: +$TOMCAT_HOME/bin/tomcat.sh -enableAdmin + +DOS: +%TOMCAT_HOME%\bin\tomcat.bat -enableAdmin + +Java2: +java -jar lib/tomcat.jar -enableAdmin + +Mac,Netware: +??? + + + +To change the admin password you'll have to edit +TOMCAT_HOME/conf/users/admin-users.xml and change the "password" attribute. + + + + 1.3 +6 -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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sanity-form.jsp 2001/02/07 06:42:48 1.2 +++ sanity-form.jsp 2001/02/10 19:08:15 1.3 @@ -23,8 +23,11 @@ Host: -Expected protocol: - ( use when testing Apache - tomcat3.x returns HTTP/1.0 ) +Expected protocol: + + HTTP/1.0 + HTTP/1.1 + + ( use HTTP/1.1 when testing with Apache or a 1.1 server connector ) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]+
cvs commit: jakarta-tomcat/src/admin/test sanity-form.jsp test.jsp
costin 01/02/06 22:42:48
Modified:src/admin/WEB-INF/classes/tadm TomcatAdmin.java
src/admin/test sanity-form.jsp test.jsp
Log:
Fix the test.jsp to allow multiple checks per request.
Revision ChangesPath
1.9 +8 -5 jakarta-tomcat/src/admin/WEB-INF/classes/tadm/TomcatAdmin.java
Index: TomcatAdmin.java
===
RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/classes/tadm/TomcatAdmin.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TomcatAdmin.java 2001/02/03 07:48:28 1.8
+++ TomcatAdmin.java 2001/02/07 06:42:48 1.9
@@ -24,7 +24,7 @@
String action;
String host;
String value;
-PageContext pageContext;
+//PageContext pageContext;
public TomcatAdmin() {}
@@ -70,9 +70,9 @@
return EVAL_PAGE;
}
-public void setPageContext(PageContext pctx ) {
- this.pageContext=pctx;
-}
+// public void setPageContext(PageContext pctx ) {
+// this.pageContext=pctx;
+// }
public void setParent( Tag parent ) {
super.setParent( parent);
@@ -84,7 +84,10 @@
private void init(HttpServletRequest request) {
Request realRequest = (Request)
request.getAttribute( Request.ATTRIB_REAL_REQUEST);
- cm = realRequest.getContext().getContextManager();
+ if( cm==null )
+ pageContext.getServletContext().log("Untrusted Application");
+ else
+ cm = realRequest.getContext().getContextManager();
}
public ContextManager getContextManager(HttpServletRequest request ) {
1.2 +1 -0 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sanity-form.jsp 2001/01/29 06:46:19 1.1
+++ sanity-form.jsp 2001/02/07 06:42:48 1.2
@@ -2,6 +2,7 @@
Target:
file
+ params
dispatch
get
requestMap
1.11 +3 -3 jakarta-tomcat/src/admin/test/test.jsp
Index: test.jsp
===
RCS file: /home/cvs/jakarta-tomcat/src/admin/test/test.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- test.jsp 2001/02/01 04:43:48 1.10
+++ test.jsp 2001/02/07 06:42:48 1.11
@@ -63,7 +63,7 @@
FAIL ( <%= failures.getDescription() %> )
<%= failures.getHttpClient().getRequestLine() %>
-TEST: <%= failures.getMatcher().getTestDescription() %>
+TEST: <%= failures.getMatchDescription() %>
Request:
@@ -74,7 +74,7 @@
Message:
- <%= failures.getMatcher().getMessage() %>
+ <%= failures.getFailureMessage() %>
<% // use a tag %>
@@ -106,7 +106,7 @@
OK ( <%= success.getDescription() %> )
<%= success.getHttpClient().getRequestLine() %>
-TEST: <%= success.getMatcher().getTestDescription() %>
+TEST: <%= success.getMatchDescription() %>
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/admin/test sanity-form.jsp test.jsp
costin 01/01/28 22:46:19 Modified:src/admin/WEB-INF admin.tld web.xml src/admin/WEB-INF/classes/tadm GTestTag.java src/admin/test test.jsp Added: src/admin/WEB-INF ant.tld src/admin/WEB-INF/classes/tadm AntProperty.java AntTEI.java AntTag.java AntTarget.java src/admin/WEB-INF/scripts run-test.sh src/admin/test sanity-form.jsp Log: A bit of reorganization of the tester before it becomes more complex. We use simpler tags - GTestTag is dealing only with GTest-specific properties. AntTag is calling ant, and you can set properties using AntProperty. Tags that deal with ant are separated from tags that deal with general administration ( which also need more specialization ) ( BTW, there are quite a few interesting pages we can add - like rebuilding a web application from the web page, etc - there is a lot of automation that can be done using tag ) Revision ChangesPath 1.8 +34 -70jakarta-tomcat/src/admin/WEB-INF/admin.tld Index: admin.tld === RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/admin.tld,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- admin.tld 2001/01/23 05:08:37 1.7 +++ admin.tld 2001/01/29 06:46:17 1.8 @@ -8,13 +8,13 @@ 1.1 Admin http://jakarta.apache.org/taglibs/tomcat_admin-1.0 - + Admin tags - + - + admin tadm.TomcatAdmin @@ -24,96 +24,60 @@ make available the "cm" and "ctx" variables. - action - false + action + false - ctxPathParam - false + ctxPathParam + false - docBaseParam - false + docBaseParam + false - docBase - false + docBase + false - ctxPath - false - true + ctxPath + false + true - ctxHost - false - true + ctxHost + false + true - value - false + value + false - - - iterate - tadm.TomcatIterate -tadm.TomcatIterateTEI - JSP - - enumeration - false - true - - - array - false - true - - - name - true - - - type - true - - - - - + -gtest -tadm.GTestTag -tadm.GTestTEI - - Run a GTest-based test suite. - +iterate +tadm.TomcatIterate +tadm.TomcatIterateTEI +JSP - testFile - true + enumeration + false + true - testApp - false + array + false + true - target - false - true + name + true - debug - false - true + type + true - - outputType - false - true - - - 1.6 +31 -25jakarta-tomcat/src/admin/WEB-INF/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/web.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- web.xml 2001/01/24 01:44:33 1.5 +++ web.xml 2001/01/29 06:46:18 1.6 @@ -1,29 +1,35 @@ -http://java.sun.com/j2ee/dtds/web-app_2_2.dtd"> + - - Tomcat Admin - - - http://jakarta.apache.org/taglibs/tomcat_admin-1.0 - /WEB-INF/admin.tld - - - - Protected Area - /contextAdmin/* - DELETE - GET - POST - PUT - - - admin - - - - BASIC - Admin - + Tomcat Admin + +http://jakarta.apache.org/taglibs/tomcat_admin-1.0 +/WEB-INF/admin.tld + + +http://jakarta.apache.org/taglibs/ant-1.0 +/WEB-INF/ant.tld + + + + + Protected Area + /contextAdmin/* + DELETE + GET + POST + PUT + + + admin + + + + +BASIC +Admin + 1.1 jakarta-tomcat/src/admin/WEB-INF/ant.tld Index: ant.tld === http
