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 @@ +!-- + Copyright 2001-2004 The Apache Software Foundation + + Licensed under the Apache License, Version 2.0 (the License); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- form method=GET action=test.jsp %! 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 @@ -htmltitleTomcat Self-Test/title +htmlhead +!-- + Copyright 2001-2004 The Apache Software Foundation + + Licensed under the Apache License, Version 2.0 (the License); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- +titleTomcat Self-Test/title +/head body bgcolor=#FF h1Tomcat Self-test/h1 %@ 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 @@ +!-- + Copyright 2001-2004 The Apache Software Foundation + + Licensed under the Apache License, Version 2.0 (the License); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- h1Tomcat Self-test/h1 %@ 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 @@ +!-- + Copyright 2001-2004 The Apache Software Foundation + + Licensed under the Apache License, Version 2.0 (the License); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under
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 @@ 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 - 1.2 +++ watchdog-jsp.xml 20 Feb 2004 03:55:03 - 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 - 1.6 +++ watchdog-servlet.xml 20 Feb 2004 03:55:03 - 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 - 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 @@ trtd valign=topExpected protocol:/td td valign=topselect name=server.proto % listOptions(protocols, curProto, out); %/select/td -td valign=topSpecify HTTP/1.0 for Tomcat as the host web serverbr -Specify HTTP/1.1 for others./td/tr +td valign=topSpecify 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 trtd valign=topStatic Page Server: /td td valign=topselect name=static.server % listOptions(webservers, staticServer, out); %/select/td - 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 @@ td valign=topThe host web server to test./td/tr trtd valign=topHost HTTP Port:/td td valign=topinput type=text name=port -value=%= request.getServerPort() % size=10/td +value=%= curPort % size=10/td td valign=topHTTP port being used by the host web server.br Specify 8080 for Tomcat and 80 for others./td/tr trtd valign=topExpected protocol:/td -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
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: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
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 @@ optionrequestMap/option optionpost/option optionwrong_request/option - optionunavailable/option optionrestricted/option optionjsp/option + optionunavailable/option + optionheaders/option + optionsecurity_chk_url/option + optionsecurity_chk/option + optionaaa/option optionspecial/option optiontomcat-standalone/option optiontomcat-apache/option
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 @@ lia href="./contextAdmin/moduleList.jsp"Modules/a lia href="./contextAdmin/contextAdmin.html"Context Admin/a lia href="/examples/jsp/snp/snoop.jsp"Snoop/a + lia href="./test"Test applications/a /ul + +bIMPORTANT: /b 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. +br +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: +pre +lt;Context path="/admin" + docBase="webapps/admin" + trusted="true" gt; +lt;SimpleRealm filename="conf/users/admin-users.xml" /gt; +lt;/Contextgt; +/pre + +p +You can also do that by running the command: +pre +Unix: +$TOMCAT_HOME/bin/tomcat.sh -enableAdmin + +DOS: +%TOMCAT_HOME%\bin\tomcat.bat -enableAdmin + +Java2: +java -jar lib/tomcat.jar -enableAdmin + +Mac,Netware: +??? +/pre + +p +To change the admin password you'll have to edit +TOMCAT_HOME/conf/users/admin-users.xml and change the "password" attribute. + +!-- +p +You can do both by running the command: +pre +Unix: +$TOMCAT_HOME/bin/tomcat.sh -enableAdmin password + +DOS: +%TOMCAT_HOME%\bin\tomcat.bat -enableAdmin password + +Mac,Netware: +??? +/pre + +-- + + /body /html 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 @@ br Host: input type="input" name="host" value="%= request.getServerName() %" br -Expected protocol: input type="input" name="server.proto" - value="%= request.getProtocol() %" - ( use when testing Apache - tomcat3.x returns HTTP/1.0 ) br +Expected protocol: +select name="server.proto" + option selectedHTTP/1.0/option + optionHTTP/1.1/option +/select + ( use HTTP/1.1 when testing with Apache or a 1.1 server connector ) br input type="submit" /form - 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: select name="target" optionfile/option + optionparams/option optiondispatch/option optionget/option optionrequestMap/option 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 @@ font color='red' FAIL /font/a ( %= failures.getDescription() % ) %= failures.getHttpClient().getRequestLine() % br -TEST: %= failures.getMatcher().getTestDescription() % +TEST: %= failures.getMatchDescription() % br bRequest: /b pre @@ -74,7 +74,7 @@ br bMessage: /b pre - %= failures.getMatcher().getMessage() % + %= failures.getFailureMessage() % /pre % // use a tag % @@ -106,7 +106,7 @@ OK/a ( %= success.getDescription() % ) %= success.getHttpClient().getRequestLine() % br -TEST: %= success.getMatcher().getTestDescription() % +TEST: %= success.getMatchDescription() % br /adm:iterate /body - 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 ant 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 @@ jspversion1.1/jspversion shortnameAdmin/shortname urihttp://jakarta.apache.org/taglibs/tomcat_admin-1.0/uri - + info Admin tags /info - + !-- Defined Custom Tags *** -- - + tag nameadmin/name tagclasstadm.TomcatAdmin/tagclass @@ -24,96 +24,60 @@ make available the "cm" and "ctx" variables. /info attribute - nameaction/name - requiredfalse/required + nameaction/name + requiredfalse/required /attribute attribute - namectxPathParam/name - requiredfalse/required + namectxPathParam/name + requiredfalse/required /attribute attribute - namedocBaseParam/name - requiredfalse/required + namedocBaseParam/name + requiredfalse/required /attribute attribute - namedocBase/name - requiredfalse/required + namedocBase/name + requiredfalse/required /attribute attribute - namectxPath/name - requiredfalse/required - rtexprvaluetrue/rtexprvalue + namectxPath/name + requiredfalse/required + rtexprvaluetrue/rtexprvalue /attribute attribute - namectxHost/name - requiredfalse/required - rtexprvaluetrue/rtexprvalue + namectxHost/name + requiredfalse/required + rtexprvaluetrue/rtexprvalue /attribute attribute - namevalue/name - requiredfalse/required + namevalue/name + requiredfalse/required /attribute /tag - - tag - nameiterate/name - tagclasstadm.TomcatIterate/tagclass -teiclasstadm.TomcatIterateTEI/teiclass - bodycontentJSP/bodycontent - attribute - nameenumeration/name - requiredfalse/required - rtexprvaluetrue/rtexprvalue - /attribute - attribute - namearray/name - requiredfalse/required - rtexprvaluetrue/rtexprvalue - /attribute - attribute - namename/name - requiredtrue/required - /attribute - attribute - nametype/name - requiredtrue/required - /attribute - - /tag - - + !-- this is a "generic" tag, should be moved in a separate tld -- tag -namegtest/name -tagclasstadm.GTestTag/tagclass -teiclasstadm.GTestTEI/teiclass -info - Run a GTest-based test suite. -/info +nameiterate/name +tagclasstadm.TomcatIterate/tagclass +teiclasstadm.TomcatIterateTEI/teiclass +bodycontentJSP/bodycontent attribute - nametestFile/name - requiredtrue/required + nameenumeration/name + requiredfalse/required + rtexprvaluetrue/rtexprvalue /attribute attribute - nametestApp/name - requiredfalse/required + namearray/name + requiredfalse/required + rtexprvaluetrue/rtexprvalue /attribute attribute - nametarget/name - requiredfalse/required - rtexprvaluetrue/rtexprvalue + namename/name + requiredtrue/required /attribute attribute - namedebug/name - requiredfalse/required - rtexprvaluetrue/rtexprvalue + nametype/name + requiredtrue/required /attribute -attribute - nameoutputType/name -