You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by cm...@apache.org on 2003/05/25 16:50:50 UTC
cvs commit: jakarta-cactus/samples/servlet/src/webapp/j2ee12/WEB-INF cactus-web.xml web.xml
cmlenz 2003/05/25 07:50:50
Modified: samples/servlet/src/webapp/j2ee13/WEB-INF web.xml
samples/servlet/src/webapp/j2ee12/WEB-INF web.xml
Added: samples/servlet/src/webapp/j2ee13/WEB-INF cactus-web.xml
samples/servlet/src/webapp/j2ee12/WEB-INF cactus-web.xml
Log:
Move Cactus-specific definitions out of the main descriptor
Revision Changes Path
1.3 +0 -80 jakarta-cactus/samples/servlet/src/webapp/j2ee13/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/servlet/src/webapp/j2ee13/WEB-INF/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 12 May 2003 09:22:48 -0000 1.2
+++ web.xml 25 May 2003 14:50:50 -0000 1.3
@@ -1,87 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
-
- <servlet>
- <servlet-name>ServletRedirector</servlet-name>
- <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
- <init-param>
- <param-name>param1</param-name>
- <param-value>value1 used for testing</param-value>
- </init-param>
- </servlet>
-
- <servlet>
- <servlet-name>ServletRedirectorSecure</servlet-name>
- <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>ServletRedirector_TestOverride</servlet-name>
- <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
- <init-param>
- <param-name>param2</param-name>
- <param-value>value2 used for testing</param-value>
- </init-param>
- </servlet>
-
- <servlet>
- <servlet-name>TestJsp</servlet-name>
- <jsp-file>/test/test.jsp</jsp-file>
- </servlet>
-
- <servlet>
- <servlet-name>JspRedirector</servlet-name>
- <jsp-file>/jspRedirector.jsp</jsp-file>
- <init-param>
- <param-name>param1</param-name>
- <param-value>value1 used for testing</param-value>
- </init-param>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>ServletRedirectorSecure</servlet-name>
- <url-pattern>/ServletRedirectorSecure</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>ServletRedirector_TestOverride</servlet-name>
- <url-pattern>/ServletRedirectorOverride</url-pattern>
- </servlet-mapping>
-
- <!-- Authentication -->
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>SecurityRestriction</web-resource-name>
- <description>Protect the Cactus redirector servlet.</description>
- <url-pattern>/ServletRedirectorSecure</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- </web-resource-collection>
- <auth-constraint>
- <description>Authorized Users Group</description>
- <role-name>test</role-name>
- </auth-constraint>
- <user-data-constraint>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm-name>Sample Cactus Servlet Application</realm-name>
- </login-config>
-
- <security-role>
- <description>Test role</description>
- <role-name>test</role-name>
- </security-role>
-
- <!-- End Authentication -->
-
</web-app>
1.1 jakarta-cactus/samples/servlet/src/webapp/j2ee13/WEB-INF/cactus-web.xml
Index: cactus-web.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<servlet>
<servlet-name>ServletRedirector</servlet-name>
<servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
<init-param>
<param-name>param1</param-name>
<param-value>value1 used for testing</param-value>
</init-param>
</servlet>
<servlet>
<servlet-name>ServletRedirectorSecure</servlet-name>
<servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
</servlet>
<servlet>
<servlet-name>ServletRedirector_TestOverride</servlet-name>
<servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
<init-param>
<param-name>param2</param-name>
<param-value>value2 used for testing</param-value>
</init-param>
</servlet>
<servlet>
<servlet-name>TestJsp</servlet-name>
<jsp-file>/test/test.jsp</jsp-file>
</servlet>
<servlet>
<servlet-name>JspRedirector</servlet-name>
<jsp-file>/jspRedirector.jsp</jsp-file>
<init-param>
<param-name>param1</param-name>
<param-value>value1 used for testing</param-value>
</init-param>
</servlet>
<servlet-mapping>
<servlet-name>ServletRedirectorSecure</servlet-name>
<url-pattern>/ServletRedirectorSecure</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>ServletRedirector_TestOverride</servlet-name>
<url-pattern>/ServletRedirectorOverride</url-pattern>
</servlet-mapping>
<!-- Authentication -->
<security-constraint>
<web-resource-collection>
<web-resource-name>SecurityRestriction</web-resource-name>
<description>Protect the Cactus redirector servlet.</description>
<url-pattern>/ServletRedirectorSecure</url-pattern>
<http-method>GET</http-method>
<http-method>POST</http-method>
</web-resource-collection>
<auth-constraint>
<description>Authorized Users Group</description>
<role-name>test</role-name>
</auth-constraint>
<user-data-constraint>
<transport-guarantee>NONE</transport-guarantee>
</user-data-constraint>
</security-constraint>
<login-config>
<auth-method>BASIC</auth-method>
<realm-name>Sample Cactus Servlet Application</realm-name>
</login-config>
<security-role>
<description>Test role</description>
<role-name>test</role-name>
</security-role>
<!-- End Authentication -->
</web-app>
1.4 +0 -84 jakarta-cactus/samples/servlet/src/webapp/j2ee12/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/servlet/src/webapp/j2ee12/WEB-INF/web.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- web.xml 12 May 2003 16:13:13 -0000 1.3
+++ web.xml 25 May 2003 14:50:50 -0000 1.4
@@ -1,91 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
"http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
<web-app>
-
- <servlet>
- <servlet-name>ServletRedirector</servlet-name>
- <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
- <init-param>
- <param-name>param1</param-name>
- <param-value>value1 used for testing</param-value>
- </init-param>
- </servlet>
-
- <servlet>
- <servlet-name>ServletRedirectorSecure</servlet-name>
- <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>ServletRedirector_TestOverride</servlet-name>
- <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
- <init-param>
- <param-name>param2</param-name>
- <param-value>value2 used for testing</param-value>
- </init-param>
- </servlet>
-
- <servlet>
- <servlet-name>TestJsp</servlet-name>
- <jsp-file>/test/test.jsp</jsp-file>
- </servlet>
-
- <servlet>
- <servlet-name>JspRedirector</servlet-name>
- <jsp-file>/jspRedirector.jsp</jsp-file>
- <init-param>
- <param-name>param1</param-name>
- <param-value>value1 used for testing</param-value>
- </init-param>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>ServletRedirectorSecure</servlet-name>
- <url-pattern>/ServletRedirectorSecure</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>ServletRedirector_TestOverride</servlet-name>
- <url-pattern>/ServletRedirectorOverride</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>TestJsp</servlet-name>
- <url-pattern>/TestJsp</url-pattern>
- </servlet-mapping>
-
- <!-- Authentication -->
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>SecurityRestriction</web-resource-name>
- <description>Protect the Cactus redirector servlet.</description>
- <url-pattern>/ServletRedirectorSecure</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- </web-resource-collection>
- <auth-constraint>
- <description>Authorized Users Group</description>
- <role-name>test</role-name>
- </auth-constraint>
- <user-data-constraint>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-
- <login-config>
- <auth-method>BASIC</auth-method>
- </login-config>
-
- <security-role>
- <description>Test role</description>
- <role-name>test</role-name>
- </security-role>
-
- <!-- End Authentication -->
-
</web-app>
1.1 jakarta-cactus/samples/servlet/src/webapp/j2ee12/WEB-INF/cactus-web.xml
Index: cactus-web.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
"http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
<web-app>
<servlet>
<servlet-name>ServletRedirector</servlet-name>
<servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
<init-param>
<param-name>param1</param-name>
<param-value>value1 used for testing</param-value>
</init-param>
</servlet>
<servlet>
<servlet-name>ServletRedirectorSecure</servlet-name>
<servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
</servlet>
<servlet>
<servlet-name>ServletRedirector_TestOverride</servlet-name>
<servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
<init-param>
<param-name>param2</param-name>
<param-value>value2 used for testing</param-value>
</init-param>
</servlet>
<servlet>
<servlet-name>TestJsp</servlet-name>
<jsp-file>/test/test.jsp</jsp-file>
</servlet>
<servlet>
<servlet-name>JspRedirector</servlet-name>
<jsp-file>/jspRedirector.jsp</jsp-file>
<init-param>
<param-name>param1</param-name>
<param-value>value1 used for testing</param-value>
</init-param>
</servlet>
<servlet-mapping>
<servlet-name>ServletRedirectorSecure</servlet-name>
<url-pattern>/ServletRedirectorSecure</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>ServletRedirector_TestOverride</servlet-name>
<url-pattern>/ServletRedirectorOverride</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>TestJsp</servlet-name>
<url-pattern>/TestJsp</url-pattern>
</servlet-mapping>
<!-- Authentication -->
<security-constraint>
<web-resource-collection>
<web-resource-name>SecurityRestriction</web-resource-name>
<description>Protect the Cactus redirector servlet.</description>
<url-pattern>/ServletRedirectorSecure</url-pattern>
<http-method>GET</http-method>
<http-method>POST</http-method>
</web-resource-collection>
<auth-constraint>
<description>Authorized Users Group</description>
<role-name>test</role-name>
</auth-constraint>
<user-data-constraint>
<transport-guarantee>NONE</transport-guarantee>
</user-data-constraint>
</security-constraint>
<login-config>
<auth-method>BASIC</auth-method>
</login-config>
<security-role>
<description>Test role</description>
<role-name>test</role-name>
</security-role>
<!-- End Authentication -->
</web-app>
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org