Author: owulff
Date: Fri Jan 18 15:15:54 2013
New Revision: 1435187
URL: http://svn.apache.org/viewvc?rev=1435187&view=rev
Log:
Minor updates in examples
Modified:
cxf/fediz/trunk/examples/simpleWebapp/src/main/webapp/WEB-INF/web.xml
cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/web.xml
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/web.xml
cxf/fediz/trunk/systests/simpleWebapp/src/main/webapp/WEB-INF/web.xml
Modified: cxf/fediz/trunk/examples/simpleWebapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/simpleWebapp/src/main/webapp/WEB-INF/web.xml?rev=1435187&r1=1435186&r2=1435187&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/simpleWebapp/src/main/webapp/WEB-INF/web.xml
(original)
+++ cxf/fediz/trunk/examples/simpleWebapp/src/main/webapp/WEB-INF/web.xml Fri
Jan 18 15:15:54 2013
@@ -3,27 +3,8 @@
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
version="3.0" metadata-complete="true">
- <description>
- WS Federation Tomcat Example
- </description>
- <display-name>WS Federation Tomcat Example</display-name>
-
- <filter>
- <filter-name>FederationFilter</filter-name>
-
<filter-class>org.apache.cxf.fediz.example.FederationFilter</filter-class>
- <!--
- <init-param>
- <param-name>security.token.attribute</param-name>
-
<param-value>org.apache.fediz.SECURITY_TOKEN</param-value>
- </init-param>
- -->
- </filter>
-
- <!-- now map this filter to a URL-pattern -->
- <filter-mapping>
- <filter-name>FederationFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
+ <description>WS Federation Simple Web Application Example</description>
+ <display-name>WS Federation Simple Web Application
Example</display-name>
<servlet>
<servlet-name>FederationServlet</servlet-name>
@@ -35,6 +16,21 @@
<url-pattern>/secure/fedservlet</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>FederationServlet</servlet-name>
+ <url-pattern>/secure/admin/fedservlet</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>FederationServlet</servlet-name>
+ <url-pattern>/secure/user/fedservlet</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>FederationServlet</servlet-name>
+ <url-pattern>/secure/manager/fedservlet</url-pattern>
+ </servlet-mapping>
+
<security-role>
<role-name>Manager</role-name>
</security-role>
@@ -57,6 +53,38 @@
<role-name>*</role-name>
</auth-constraint>
</security-constraint>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Protected Admin
Area</web-resource-name>
+ <url-pattern>/secure/admin/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>Admin</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Protected Manager
Area</web-resource-name>
+ <url-pattern>/secure/manager/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>Manager</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Protected User
Area</web-resource-name>
+ <url-pattern>/secure/user/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>User</role-name>
+ <role-name>Admin</role-name>
+ <role-name>Manager</role-name>
+ </auth-constraint>
+ </security-constraint>
<login-config>
<auth-method>WSFED</auth-method>
Modified:
cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml?rev=1435187&r1=1435186&r2=1435187&view=diff
==============================================================================
---
cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
(original)
+++
cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
Fri Jan 18 15:15:54 2013
@@ -86,7 +86,7 @@
<sec:intercept-url pattern="/secure/manager/**"
access="ROLE_MANAGER"/>
<sec:intercept-url pattern="/secure/admin/**"
access="ROLE_ADMIN"/>
<sec:intercept-url pattern="/secure/user/**"
access="ROLE_USER,ROLE_ADMIN,ROLE_MANAGER"/>
- <sec:intercept-url pattern="/secure/fedservlet"
access="ROLE_USER,ROLE_ADMIN,ROLE_MANAGER"/>
+ <sec:intercept-url pattern="/secure/fedservlet"
access="ROLE_USER,ROLE_ADMIN,ROLE_MANAGER,ROLE_AUTHENTICATED"/>
</sec:filter-invocation-definition-source>
</property>
</bean>
Modified: cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/web.xml?rev=1435187&r1=1435186&r2=1435187&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/web.xml
(original)
+++ cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/web.xml Fri
Jan 18 15:15:54 2013
@@ -25,17 +25,6 @@
<filter-name>filterChainProxy</filter-name>
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
</filter>
-
- <filter>
- <filter-name>FederationFilter</filter-name>
-
<filter-class>org.apache.cxf.fediz.example.FederationFilter</filter-class>
- </filter>
-
-
- <filter-mapping>
- <filter-name>FederationFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
<filter-mapping>
<filter-name>filterChainProxy</filter-name>
@@ -60,7 +49,7 @@
<servlet-name>FederationServlet</servlet-name>
<url-pattern>/secure/fedservlet</url-pattern>
</servlet-mapping>
-
+
<servlet-mapping>
<servlet-name>FederationServlet</servlet-name>
<url-pattern>/secure/admin/fedservlet</url-pattern>
@@ -75,7 +64,6 @@
<servlet-name>FederationServlet</servlet-name>
<url-pattern>/secure/manager/fedservlet</url-pattern>
</servlet-mapping>
-
<security-role>
<role-name>Manager</role-name>
@@ -96,7 +84,7 @@
<url-pattern>/secure/*</url-pattern>
</web-resource-collection>
<auth-constraint>
- <role-name>*</role-name>
+ <role-name>*</role-name>
</auth-constraint>
</security-constraint>
Modified:
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/web.xml?rev=1435187&r1=1435186&r2=1435187&view=diff
==============================================================================
---
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/web.xml
(original)
+++
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/web.xml
Fri Jan 18 15:15:54 2013
@@ -3,10 +3,8 @@
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
version="3.0" metadata-complete="true">
- <description>
- WS Federation Tomcat Example
- </description>
- <display-name>WS Federation Tomcat Example</display-name>
+ <description>WS Federation WS-Client Web Application
Example</description>
+ <display-name>WS Federation WS-Client Web Application
Example</display-name>
<context-param>
<param-name>contextConfigLocation</param-name>
@@ -45,8 +43,14 @@
<security-role>
<role-name>Manager</role-name>
+ </security-role>
+ <security-role>
<role-name>User</role-name>
+ </security-role>
+ <security-role>
<role-name>Admin</role-name>
+ </security-role>
+ <security-role>
<role-name>Authenticated</role-name>
</security-role>
Modified: cxf/fediz/trunk/systests/simpleWebapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/simpleWebapp/src/main/webapp/WEB-INF/web.xml?rev=1435187&r1=1435186&r2=1435187&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/simpleWebapp/src/main/webapp/WEB-INF/web.xml
(original)
+++ cxf/fediz/trunk/systests/simpleWebapp/src/main/webapp/WEB-INF/web.xml Fri
Jan 18 15:15:54 2013
@@ -15,7 +15,7 @@
<servlet-name>FederationServlet</servlet-name>
<url-pattern>/secure/fedservlet</url-pattern>
</servlet-mapping>
-
+
<servlet-mapping>
<servlet-name>FederationServlet</servlet-name>
<url-pattern>/secure/admin/fedservlet</url-pattern>
@@ -85,7 +85,7 @@
<role-name>Manager</role-name>
</auth-constraint>
</security-constraint>
-
+
<login-config>
<auth-method>WSFED</auth-method>
<realm-name>WSFED</realm-name>
