You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by la...@locus.apache.org on 2000/08/28 05:29:33 UTC
cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF web.xml
larryi 00/08/27 20:29:33
Modified: src/tests/webpages/WEB-INF Tag: tomcat_32 web.xml
Log:
Collect all <servlet> entries together.
Add PermanentlyUnavailable2 alias for PermanentlyUnavailable servlet and
load it at startup. Tests show servlet remains unavailable whether loaded at
startup or not.
Revision Changes Path
No revision
No revision
1.6.4.2 +45 -34 jakarta-tomcat/src/tests/webpages/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/web.xml,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -u -r1.6.4.1 -r1.6.4.2
--- web.xml 2000/07/06 23:27:03 1.6.4.1
+++ web.xml 2000/08/28 03:29:32 1.6.4.2
@@ -37,39 +37,7 @@
requestMap.Servlet4
</servlet-class>
</servlet>
- <servlet-mapping>
- <servlet-name>
- servlet1
- </servlet-name>
- <url-pattern>
- /foo/bar/*
- </url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>
- servlet2
- </servlet-name>
- <url-pattern>
- /baz/*
- </url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>
- servlet3
- </servlet-name>
- <url-pattern>
- /catalog
- </url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>
- servlet4
- </servlet-name>
- <url-pattern>
- *.bop
- </url-pattern>
- </servlet-mapping>
-
+
<servlet>
<servlet-name>
servletParam1
@@ -102,8 +70,51 @@
<param-name>param4</param-name>
<param-value>value4</param-value>
</init-param>
- </servlet>
+ </servlet>
+
+ <servlet>
+ <servlet-name>
+ PermanentlyUnavailable2
+ </servlet-name>
+ <servlet-class>
+ PermanentlyUnavailable
+ </servlet-class>
+ <load-on-startup></load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>
+ servlet1
+ </servlet-name>
+ <url-pattern>
+ /foo/bar/*
+ </url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>
+ servlet2
+ </servlet-name>
+ <url-pattern>
+ /baz/*
+ </url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>
+ servlet3
+ </servlet-name>
+ <url-pattern>
+ /catalog
+ </url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>
+ servlet4
+ </servlet-name>
+ <url-pattern>
+ *.bop
+ </url-pattern>
+ </servlet-mapping>
+
<security-constraint>
<web-resource-collection>
<web-resource-name>a</web-resource-name>