Author: owulff
Date: Fri Jan 18 22:21:50 2013
New Revision: 1435375
URL: http://svn.apache.org/viewvc?rev=1435375&view=rev
Log:
[FEDIZ-9] other examples updated as well to use fediz-cxf plugin (Optional)
Removed:
cxf/fediz/trunk/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationFilter.java
cxf/fediz/trunk/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/SecurityTokenThreadLocal.java
cxf/fediz/trunk/examples/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationFilter.java
cxf/fediz/trunk/examples/springWebapp/src/main/java/org/apache/cxf/fediz/example/SecurityTokenThreadLocal.java
Modified:
cxf/fediz/trunk/examples/simpleWebapp/pom.xml
cxf/fediz/trunk/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
cxf/fediz/trunk/examples/simpleWebapp/src/main/webapp/WEB-INF/web.xml
cxf/fediz/trunk/examples/springWebapp/pom.xml
cxf/fediz/trunk/examples/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/web.xml
cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/web.xml
Modified: cxf/fediz/trunk/examples/simpleWebapp/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/simpleWebapp/pom.xml?rev=1435375&r1=1435374&r2=1435375&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/simpleWebapp/pom.xml (original)
+++ cxf/fediz/trunk/examples/simpleWebapp/pom.xml Fri Jan 18 22:21:50 2013
@@ -47,7 +47,18 @@
<groupId>org.apache.cxf.fediz</groupId>
<artifactId>fediz-core</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.fediz</groupId>
+ <artifactId>fediz-cxf</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Modified:
cxf/fediz/trunk/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java?rev=1435375&r1=1435374&r2=1435375&view=diff
==============================================================================
---
cxf/fediz/trunk/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
(original)
+++
cxf/fediz/trunk/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
Fri Jan 18 22:21:50 2013
@@ -42,6 +42,7 @@ import org.apache.commons.lang3.StringEs
import org.apache.cxf.fediz.core.Claim;
import org.apache.cxf.fediz.core.ClaimCollection;
import org.apache.cxf.fediz.core.FederationPrincipal;
+import org.apache.cxf.fediz.cxf.web.SecurityTokenThreadLocal;
public class FederationServlet extends HttpServlet {
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=1435375&r1=1435374&r2=1435375&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 22:21:50 2013
@@ -6,6 +6,23 @@
<description>WS Federation Simple Web Application Example</description>
<display-name>WS Federation Simple Web Application
Example</display-name>
+ <!-- Optional: Cache the security token in Thread Local Storage -->
+ <filter>
+ <filter-name>FederationFilter</filter-name>
+
<filter-class>org.apache.cxf.fediz.cxf.web.FederationFilter</filter-class>
+ <!--
+ <init-param>
+ <param-name>security.token.attribute</param-name>
+
<param-value>org.apache.fediz.SECURITY_TOKEN</param-value>
+ </init-param>
+ -->
+ </filter>
+
+ <filter-mapping>
+ <filter-name>FederationFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
<servlet>
<servlet-name>FederationServlet</servlet-name>
<servlet-class>org.apache.cxf.fediz.example.FederationServlet</servlet-class>
Modified: cxf/fediz/trunk/examples/springWebapp/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/springWebapp/pom.xml?rev=1435375&r1=1435374&r2=1435375&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/springWebapp/pom.xml (original)
+++ cxf/fediz/trunk/examples/springWebapp/pom.xml Fri Jan 18 22:21:50 2013
@@ -50,7 +50,18 @@
<groupId>org.apache.cxf.fediz</groupId>
<artifactId>fediz-core</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.fediz</groupId>
+ <artifactId>fediz-cxf</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf.fediz</groupId>
Modified:
cxf/fediz/trunk/examples/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java?rev=1435375&r1=1435374&r2=1435375&view=diff
==============================================================================
---
cxf/fediz/trunk/examples/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
(original)
+++
cxf/fediz/trunk/examples/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
Fri Jan 18 22:21:50 2013
@@ -42,6 +42,7 @@ import org.apache.commons.lang3.StringEs
import org.apache.cxf.fediz.core.Claim;
import org.apache.cxf.fediz.core.ClaimCollection;
import org.apache.cxf.fediz.core.FederationPrincipal;
+import org.apache.cxf.fediz.cxf.web.SecurityTokenThreadLocal;
import org.springframework.security.core.context.SecurityContextHolder;
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=1435375&r1=1435374&r2=1435375&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 22:21:50 2013
@@ -26,11 +26,28 @@
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
</filter>
+ <!-- Optional: Cache the security token in Thread Local Storage -->
+ <filter>
+ <filter-name>FederationFilter</filter-name>
+
<filter-class>org.apache.cxf.fediz.cxf.web.FederationFilter</filter-class>
+ <!--
+ <init-param>
+ <param-name>security.token.attribute</param-name>
+
<param-value>org.apache.fediz.SECURITY_TOKEN</param-value>
+ </init-param>
+ -->
+ </filter>
+
<filter-mapping>
<filter-name>filterChainProxy</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
+ <filter-mapping>
+ <filter-name>FederationFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
<!--
- Loads the root application context of this web app at startup.
- The application context is then available via
Modified: cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml?rev=1435375&r1=1435374&r2=1435375&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml (original)
+++ cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml Fri Jan 18 22:21:50
2013
@@ -57,18 +57,18 @@
<groupId>org.apache.cxf.fediz</groupId>
<artifactId>fediz-core</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf.fediz</groupId>
<artifactId>fediz-cxf</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
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=1435375&r1=1435374&r2=1435375&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 22:21:50 2013
@@ -6,14 +6,15 @@
<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>
- <param-value>WEB-INF/applicationContext.xml</param-value>
- </context-param>
- <listener>
-
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
-
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>WEB-INF/applicationContext.xml</param-value>
+ </context-param>
+ <listener>
+
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+ </listener>
+
+ <!-- Required: Cache the security token in Thread Local Storage -->
<filter>
<filter-name>FederationFilter</filter-name>
<filter-class>org.apache.cxf.fediz.cxf.web.FederationFilter</filter-class>
