You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ow...@apache.org on 2013/06/20 21:14:55 UTC
svn commit: r1495139 - in /cxf/fediz/trunk: examples/simpleWebapp/
examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/
examples/simpleWebapp/src/main/webapp/WEB-INF/ examples/spring2Webapp/
examples/spring2Webapp/src/main/java/org/apache/...
Author: owulff
Date: Thu Jun 20 19:14:54 2013
New Revision: 1495139
URL: http://svn.apache.org/r1495139
Log:
Non CXF dependent classes moved to fediz-core
Added:
cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/SecurityTokenThreadLocal.java
- copied, changed from r1491277, cxf/fediz/trunk/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/web/SecurityTokenThreadLocal.java
Removed:
cxf/fediz/trunk/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/web/FederationFilter.java
cxf/fediz/trunk/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/web/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/spring2Webapp/pom.xml
cxf/fediz/trunk/examples/spring2Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
cxf/fediz/trunk/examples/spring2Webapp/src/main/webapp/WEB-INF/web.xml
cxf/fediz/trunk/examples/springPreauthWebapp/pom.xml
cxf/fediz/trunk/examples/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
cxf/fediz/trunk/examples/springPreauthWebapp/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/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/web.xml
cxf/fediz/trunk/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/web/ThreadLocalCallbackHandler.java
cxf/fediz/trunk/systests/simpleWebapp/pom.xml
cxf/fediz/trunk/systests/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
cxf/fediz/trunk/systests/simpleWebapp/src/main/webapp/WEB-INF/web.xml
cxf/fediz/trunk/systests/spring2Webapp/pom.xml
cxf/fediz/trunk/systests/spring2Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
cxf/fediz/trunk/systests/spring2Webapp/src/main/webapp/WEB-INF/web.xml
cxf/fediz/trunk/systests/springPreauthWebapp/pom.xml
cxf/fediz/trunk/systests/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
cxf/fediz/trunk/systests/springPreauthWebapp/src/main/webapp/WEB-INF/web.xml
cxf/fediz/trunk/systests/springWebapp/pom.xml
cxf/fediz/trunk/systests/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
cxf/fediz/trunk/systests/springWebapp/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=1495139&r1=1495138&r2=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/simpleWebapp/pom.xml (original)
+++ cxf/fediz/trunk/examples/simpleWebapp/pom.xml Thu Jun 20 19:14:54 2013
@@ -50,11 +50,6 @@
<scope>provided</scope>
</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/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=1495139&r1=1495138&r2=1495139&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 Thu Jun 20 19:14:54 2013
@@ -42,7 +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.cxf.fediz.core.SecurityTokenThreadLocal;
public class FederationServlet extends HttpServlet {
@@ -113,4 +113,4 @@ public class FederationServlet extends H
out.println("</body>");
}
-}
\ No newline at end of file
+}
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=1495139&r1=1495138&r2=1495139&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 Thu Jun 20 19:14:54 2013
@@ -9,7 +9,7 @@
<!-- 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>
+ <filter-class>org.apache.cxf.fediz.core.servlet.FederationFilter</filter-class>
</filter>
<filter-mapping>
Modified: cxf/fediz/trunk/examples/spring2Webapp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/spring2Webapp/pom.xml?rev=1495139&r1=1495138&r2=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/spring2Webapp/pom.xml (original)
+++ cxf/fediz/trunk/examples/spring2Webapp/pom.xml Thu Jun 20 19:14:54 2013
@@ -67,11 +67,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.cxf.fediz</groupId>
- <artifactId>fediz-cxf</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
Modified: cxf/fediz/trunk/examples/spring2Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/spring2Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java?rev=1495139&r1=1495138&r2=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/spring2Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java (original)
+++ cxf/fediz/trunk/examples/spring2Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java Thu Jun 20 19:14:54 2013
@@ -39,7 +39,7 @@ import org.w3c.dom.Element;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.cxf.fediz.core.Claim;
import org.apache.cxf.fediz.core.ClaimCollection;
-import org.apache.cxf.fediz.cxf.web.SecurityTokenThreadLocal;
+import org.apache.cxf.fediz.core.SecurityTokenThreadLocal;
import org.apache.cxf.fediz.spring.FederationUser;
import org.apache.cxf.fediz.spring.authentication.FederationAuthenticationToken;
Modified: cxf/fediz/trunk/examples/spring2Webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/spring2Webapp/src/main/webapp/WEB-INF/web.xml?rev=1495139&r1=1495138&r2=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/spring2Webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ cxf/fediz/trunk/examples/spring2Webapp/src/main/webapp/WEB-INF/web.xml Thu Jun 20 19:14:54 2013
@@ -14,7 +14,7 @@
<!-- 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>
+ <filter-class>org.apache.cxf.fediz.core.servlet.FederationFilter</filter-class>
</filter>
<filter-mapping>
Modified: cxf/fediz/trunk/examples/springPreauthWebapp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/springPreauthWebapp/pom.xml?rev=1495139&r1=1495138&r2=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/springPreauthWebapp/pom.xml (original)
+++ cxf/fediz/trunk/examples/springPreauthWebapp/pom.xml Thu Jun 20 19:14:54 2013
@@ -54,11 +54,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf.fediz</groupId>
- <artifactId>fediz-cxf</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.fediz</groupId>
<artifactId>fediz-spring</artifactId>
<version>${project.version}</version>
</dependency>
Modified: cxf/fediz/trunk/examples/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java?rev=1495139&r1=1495138&r2=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java (original)
+++ cxf/fediz/trunk/examples/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java Thu Jun 20 19:14:54 2013
@@ -42,7 +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.cxf.fediz.core.SecurityTokenThreadLocal;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
@@ -124,4 +124,4 @@ public class FederationServlet extends H
out.println("</body>");
}
-}
\ No newline at end of file
+}
Modified: cxf/fediz/trunk/examples/springPreauthWebapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/springPreauthWebapp/src/main/webapp/WEB-INF/web.xml?rev=1495139&r1=1495138&r2=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/springPreauthWebapp/src/main/webapp/WEB-INF/web.xml (original)
+++ cxf/fediz/trunk/examples/springPreauthWebapp/src/main/webapp/WEB-INF/web.xml Thu Jun 20 19:14:54 2013
@@ -29,7 +29,7 @@
<!-- 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>
+ <filter-class>org.apache.cxf.fediz.core.servlet.FederationFilter</filter-class>
</filter>
<filter-mapping>
Modified: cxf/fediz/trunk/examples/springWebapp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/springWebapp/pom.xml?rev=1495139&r1=1495138&r2=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/springWebapp/pom.xml (original)
+++ cxf/fediz/trunk/examples/springWebapp/pom.xml Thu Jun 20 19:14:54 2013
@@ -33,14 +33,6 @@
<spring.version>3.1.3.RELEASE</spring.version>
</properties>
<dependencies>
-<!--
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- <scope>provided</scope>
- </dependency>
--->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -48,11 +40,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.cxf.fediz</groupId>
- <artifactId>fediz-cxf</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
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=1495139&r1=1495138&r2=1495139&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 Thu Jun 20 19:14:54 2013
@@ -39,7 +39,7 @@ import org.w3c.dom.Element;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.cxf.fediz.core.Claim;
import org.apache.cxf.fediz.core.ClaimCollection;
-import org.apache.cxf.fediz.cxf.web.SecurityTokenThreadLocal;
+import org.apache.cxf.fediz.core.SecurityTokenThreadLocal;
import org.apache.cxf.fediz.spring.FederationUser;
import org.apache.cxf.fediz.spring.authentication.FederationAuthenticationToken;
@@ -122,4 +122,4 @@ public class FederationServlet extends H
out.println("</body>");
}
-}
\ No newline at end of file
+}
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=1495139&r1=1495138&r2=1495139&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 Thu Jun 20 19:14:54 2013
@@ -14,7 +14,7 @@
<!-- 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>
+ <filter-class>org.apache.cxf.fediz.core.servlet.FederationFilter</filter-class>
</filter>
<filter-mapping>
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=1495139&r1=1495138&r2=1495139&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 Thu Jun 20 19:14:54 2013
@@ -42,7 +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.cxf.fediz.core.SecurityTokenThreadLocal;
import org.apache.hello_world_soap_http.Greeter;
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=1495139&r1=1495138&r2=1495139&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 Thu Jun 20 19:14:54 2013
@@ -17,7 +17,7 @@
<!-- 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>
+ <filter-class>org.apache.cxf.fediz.core.servlet.FederationFilter</filter-class>
</filter>
<!-- now map this filter to a URL-pattern -->
Copied: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/SecurityTokenThreadLocal.java (from r1491277, cxf/fediz/trunk/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/web/SecurityTokenThreadLocal.java)
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/SecurityTokenThreadLocal.java?p2=cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/SecurityTokenThreadLocal.java&p1=cxf/fediz/trunk/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/web/SecurityTokenThreadLocal.java&r1=1491277&r2=1495139&rev=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/web/SecurityTokenThreadLocal.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/SecurityTokenThreadLocal.java Thu Jun 20 19:14:54 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.fediz.cxf.web;
+package org.apache.cxf.fediz.core;
import org.w3c.dom.Element;
Modified: cxf/fediz/trunk/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/web/ThreadLocalCallbackHandler.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/web/ThreadLocalCallbackHandler.java?rev=1495139&r1=1495138&r2=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/web/ThreadLocalCallbackHandler.java (original)
+++ cxf/fediz/trunk/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/web/ThreadLocalCallbackHandler.java Thu Jun 20 19:14:54 2013
@@ -27,6 +27,8 @@ import javax.security.auth.callback.Call
import javax.security.auth.callback.UnsupportedCallbackException;
import org.w3c.dom.Element;
+
+import org.apache.cxf.fediz.core.SecurityTokenThreadLocal;
import org.apache.cxf.ws.security.trust.delegation.DelegationCallback;
import org.apache.ws.security.util.DOM2Writer;
Modified: cxf/fediz/trunk/systests/simpleWebapp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/simpleWebapp/pom.xml?rev=1495139&r1=1495138&r2=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/simpleWebapp/pom.xml (original)
+++ cxf/fediz/trunk/systests/simpleWebapp/pom.xml Thu Jun 20 19:14:54 2013
@@ -50,12 +50,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.fediz</groupId>
- <artifactId>fediz-cxf</artifactId>
- <version>${project.version}</version>
- </dependency>
+ </dependency>
</dependencies>
<build>
<!-- Name of the generated WAR file -->
Modified: cxf/fediz/trunk/systests/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java?rev=1495139&r1=1495138&r2=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java (original)
+++ cxf/fediz/trunk/systests/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java Thu Jun 20 19:14:54 2013
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
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.cxf.fediz.core.SecurityTokenThreadLocal;
public class FederationServlet extends HttpServlet {
@@ -91,4 +91,4 @@ public class FederationServlet extends H
out.println("</body>");
}
-}
\ No newline at end of file
+}
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=1495139&r1=1495138&r2=1495139&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 Thu Jun 20 19:14:54 2013
@@ -9,7 +9,7 @@
<!-- 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>
+ <filter-class>org.apache.cxf.fediz.core.servlet.FederationFilter</filter-class>
</filter>
<filter-mapping>
Modified: cxf/fediz/trunk/systests/spring2Webapp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/spring2Webapp/pom.xml?rev=1495139&r1=1495138&r2=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/spring2Webapp/pom.xml (original)
+++ cxf/fediz/trunk/systests/spring2Webapp/pom.xml Thu Jun 20 19:14:54 2013
@@ -71,11 +71,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.cxf.fediz</groupId>
- <artifactId>fediz-cxf</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
Modified: cxf/fediz/trunk/systests/spring2Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/spring2Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java?rev=1495139&r1=1495138&r2=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/spring2Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java (original)
+++ cxf/fediz/trunk/systests/spring2Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java Thu Jun 20 19:14:54 2013
@@ -34,7 +34,7 @@ import org.w3c.dom.Element;
import org.apache.cxf.fediz.core.Claim;
import org.apache.cxf.fediz.core.ClaimCollection;
-import org.apache.cxf.fediz.cxf.web.SecurityTokenThreadLocal;
+import org.apache.cxf.fediz.core.SecurityTokenThreadLocal;
import org.apache.cxf.fediz.spring.authentication.FederationAuthenticationToken;
import org.springframework.security.Authentication;
Modified: cxf/fediz/trunk/systests/spring2Webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/spring2Webapp/src/main/webapp/WEB-INF/web.xml?rev=1495139&r1=1495138&r2=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/spring2Webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ cxf/fediz/trunk/systests/spring2Webapp/src/main/webapp/WEB-INF/web.xml Thu Jun 20 19:14:54 2013
@@ -14,7 +14,7 @@
<!-- 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>
+ <filter-class>org.apache.cxf.fediz.core.servlet.FederationFilter</filter-class>
</filter>
<filter-mapping>
Modified: cxf/fediz/trunk/systests/springPreauthWebapp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/springPreauthWebapp/pom.xml?rev=1495139&r1=1495138&r2=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/springPreauthWebapp/pom.xml (original)
+++ cxf/fediz/trunk/systests/springPreauthWebapp/pom.xml Thu Jun 20 19:14:54 2013
@@ -60,55 +60,50 @@
<groupId>org.apache.cxf.fediz</groupId>
<artifactId>fediz-spring</artifactId>
<version>${project.version}</version>
- </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>
<version>3.0.1</version>
</dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- <version>3.1.3.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- <version>3.1.3.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.15</version>
- <exclusions>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ <version>3.1.3.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-config</artifactId>
+ <version>3.1.3.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.15</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
Modified: cxf/fediz/trunk/systests/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java?rev=1495139&r1=1495138&r2=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java (original)
+++ cxf/fediz/trunk/systests/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java Thu Jun 20 19:14:54 2013
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
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.cxf.fediz.core.SecurityTokenThreadLocal;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
Modified: cxf/fediz/trunk/systests/springPreauthWebapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/springPreauthWebapp/src/main/webapp/WEB-INF/web.xml?rev=1495139&r1=1495138&r2=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/springPreauthWebapp/src/main/webapp/WEB-INF/web.xml (original)
+++ cxf/fediz/trunk/systests/springPreauthWebapp/src/main/webapp/WEB-INF/web.xml Thu Jun 20 19:14:54 2013
@@ -29,7 +29,7 @@
<!-- 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>
+ <filter-class>org.apache.cxf.fediz.core.servlet.FederationFilter</filter-class>
</filter>
<filter-mapping>
Modified: cxf/fediz/trunk/systests/springWebapp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/springWebapp/pom.xml?rev=1495139&r1=1495138&r2=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/springWebapp/pom.xml (original)
+++ cxf/fediz/trunk/systests/springWebapp/pom.xml Thu Jun 20 19:14:54 2013
@@ -44,11 +44,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.cxf.fediz</groupId>
- <artifactId>fediz-cxf</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
Modified: cxf/fediz/trunk/systests/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java?rev=1495139&r1=1495138&r2=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java (original)
+++ cxf/fediz/trunk/systests/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java Thu Jun 20 19:14:54 2013
@@ -34,7 +34,7 @@ import org.w3c.dom.Element;
import org.apache.cxf.fediz.core.Claim;
import org.apache.cxf.fediz.core.ClaimCollection;
-import org.apache.cxf.fediz.cxf.web.SecurityTokenThreadLocal;
+import org.apache.cxf.fediz.core.SecurityTokenThreadLocal;
import org.apache.cxf.fediz.spring.authentication.FederationAuthenticationToken;
import org.springframework.security.core.Authentication;
Modified: cxf/fediz/trunk/systests/springWebapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/systests/springWebapp/src/main/webapp/WEB-INF/web.xml?rev=1495139&r1=1495138&r2=1495139&view=diff
==============================================================================
--- cxf/fediz/trunk/systests/springWebapp/src/main/webapp/WEB-INF/web.xml (original)
+++ cxf/fediz/trunk/systests/springWebapp/src/main/webapp/WEB-INF/web.xml Thu Jun 20 19:14:54 2013
@@ -29,7 +29,7 @@
<!-- 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>
+ <filter-class>org.apache.cxf.fediz.core.servlet.FederationFilter</filter-class>
</filter>
<filter-mapping>