svn commit: r1435370 - in /cxf/fediz/trunk/examples/wsclientWebapp/webapp: ./ src/main/java/org/apache/cxf/fediz/example/ src/main/webapp/WEB-INF/

[owulff]

Author: owulff
Date: Fri Jan 18 22:05:06 2013
New Revision: 1435370

URL: http://svn.apache.org/viewvc?rev=1435370&view=rev
Log:
[FEDIZ-9] wsclientWebapp example updated to use fediz-cxf plugin

Removed:
    
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationFilter.java
    
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/SecurityTokenThreadLocal.java
    
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/ThreadLocalCallbackHandler.java
Modified:
    cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml
    
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
    
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml
    
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/web.xml

Modified: cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml?rev=1435370&r1=1435369&r2=1435370&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml (original)
+++ cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml Fri Jan 18 22:05:06 
2013
@@ -57,9 +57,19 @@
             <groupId>org.apache.cxf.fediz</groupId>
             <artifactId>fediz-core</artifactId>
             <version>${project.version}</version>
-            <scope>provided</scope>
+    <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>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>${commons.lang.version}</version>

Modified: 
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
URL: 
http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java?rev=1435370&r1=1435369&r2=1435370&view=diff
==============================================================================
--- 
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
 (original)
+++ 
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
 Fri Jan 18 22:05:06 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.apache.hello_world_soap_http.Greeter;
 
 

Modified: 
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: 
http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=1435370&r1=1435369&r2=1435370&view=diff
==============================================================================
--- 
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml
 (original)
+++ 
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml
 Fri Jan 18 22:05:06 2013
@@ -26,7 +26,7 @@
        </cxf:bus>
 
        <bean id="delegationCallbackHandler"
-               class="org.apache.cxf.fediz.example.ThreadLocalCallbackHandler" 
/>
+               class="org.apache.cxf.fediz.cxf.web.ThreadLocalCallbackHandler" 
/>
 
        <jaxws:client id="HelloServiceClient" serviceName="svc:GreeterService"
                xmlns:svc="http://apache.org/hello_world_soap_http";

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=1435370&r1=1435369&r2=1435370&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:05:06 2013
@@ -16,7 +16,7 @@
 
        <filter>
                <filter-name>FederationFilter</filter-name>
-               
<filter-class>org.apache.cxf.fediz.example.FederationFilter</filter-class>
+               
<filter-class>org.apache.cxf.fediz.cxf.web.FederationFilter</filter-class>
                <!--
                <init-param>
                        <param-name>security.token.attribute</param-name>