cmlenz 2003/06/10 07:07:52
Modified: samples/servlet/src/webapp/j2ee12/WEB-INF cactus-web.xml
samples/servlet/src/webapp/j2ee13/WEB-INF cactus-web.xml
samples/servlet/src/scripts/share build.xml
Log:
Use <cactifywar> to provide a secured servlet redirector
Revision Changes Path
1.2 +0 -40
jakarta-cactus/samples/servlet/src/webapp/j2ee12/WEB-INF/cactus-web.xml
Index: cactus-web.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/samples/servlet/src/webapp/j2ee12/WEB-INF/cactus-web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cactus-web.xml 25 May 2003 14:50:50 -0000 1.1
+++ cactus-web.xml 10 Jun 2003 14:07:52 -0000 1.2
@@ -15,11 +15,6 @@
</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>
@@ -43,11 +38,6 @@
</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>
@@ -56,35 +46,5 @@
<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.2 +0 -41
jakarta-cactus/samples/servlet/src/webapp/j2ee13/WEB-INF/cactus-web.xml
Index: cactus-web.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/samples/servlet/src/webapp/j2ee13/WEB-INF/cactus-web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cactus-web.xml 25 May 2003 14:50:50 -0000 1.1
+++ cactus-web.xml 10 Jun 2003 14:07:52 -0000 1.2
@@ -15,11 +15,6 @@
</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>
@@ -43,44 +38,8 @@
</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.21 +6 -0 jakarta-cactus/samples/servlet/src/scripts/share/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/servlet/src/scripts/share/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.xml 10 Jun 2003 11:21:26 -0000 1.20
+++ build.xml 10 Jun 2003 14:07:52 -0000 1.21
@@ -255,6 +255,12 @@
<classes dir="${target.classes.cactus.dir}"/>
<lib file="${httpunit.jar}"/>
+ <!-- Provide a secured servlet redirector in addition to the
+ default servlet redirector -->
+ <servletredirector/>
+ <servletredirector name="ServletRedirectorSecure"
+ mapping="/ServletRedirectorSecure" roles="test"/>
+
<!-- Orion fails on a servlet filter that is not mapped to an actual
resource, to trick it -->
<filterredirector mapping="/test/filterRedirector.jsp"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]