Author: owulff
Date: Tue Mar 5 21:21:04 2013
New Revision: 1453003
URL: http://svn.apache.org/r1453003
Log:
Restructured Spring Plugin packages
Added:
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/FederationConfig.java
- copied, changed from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationConfig.java
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/FederationConfigImpl.java
- copied, changed from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationConfigImpl.java
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/AbstractFederationUserDetailsService.java
- copied, changed from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/AbstractFederationUserDetailsService.java
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationProvider.java
- copied, changed from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationAuthenticationProvider.java
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java
- copied, changed from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationAuthenticationToken.java
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationResponseAuthenticationToken.java
- copied, changed from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationResponseAuthenticationToken.java
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/GrantedAuthoritiesUserDetailsFederationService.java
- copied, changed from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/GrantedAuthoritiesUserDetailsFederationService.java
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/preauth/
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/preauth/FederationPreAuthenticatedProcessingFilter.java
- copied, changed from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/FederationPreAuthenticatedProcessingFilter.java
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService.java
- copied, changed from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService.java
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationEntryPoint.java
- copied, changed from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationAuthenticationEntryPoint.java
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationFilter.java
- copied, changed from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationAuthenticationFilter.java
Removed:
cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.wsfed.xml
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/FederationPreAuthenticatedProcessingFilter.java
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService.java
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/AbstractFederationUserDetailsService.java
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationAuthenticationEntryPoint.java
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationAuthenticationFilter.java
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationAuthenticationProvider.java
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationAuthenticationToken.java
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationConfig.java
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationConfigImpl.java
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationResponseAuthenticationToken.java
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/GrantedAuthoritiesUserDetailsFederationService.java
Modified:
cxf/fediz/trunk/examples/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.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/applicationContext-security.xml
Modified:
cxf/fediz/trunk/examples/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml?rev=1453003&r1=1453002&r2=1453003&view=diff
==============================================================================
---
cxf/fediz/trunk/examples/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
(original)
+++
cxf/fediz/trunk/examples/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
Tue Mar 5 21:21:04 2013
@@ -32,10 +32,10 @@
class="org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesUserDetailsService"/>
-->
<bean id="preAuthenticatedUserDetailsService"
-
class="org.apache.cxf.fediz.spring.PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService"/>
+
class="org.apache.cxf.fediz.spring.preauth.PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService"/>
<!--<bean id="j2eePreAuthFilter"
class="org.springframework.security.web.authentication.preauth.j2ee.J2eePreAuthenticatedProcessingFilter">-->
- <bean id="j2eePreAuthFilter"
class="org.apache.cxf.fediz.spring.FederationPreAuthenticatedProcessingFilter">
+ <bean id="j2eePreAuthFilter"
class="org.apache.cxf.fediz.spring.preauth.FederationPreAuthenticatedProcessingFilter">
<property name="authenticationManager" ref="authenticationManager"/>
<property name="authenticationDetailsSource">
<bean
class="org.springframework.security.web.authentication.preauth.j2ee.J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource">
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=1453003&r1=1453002&r2=1453003&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
Tue Mar 5 21:21:04 2013
@@ -41,7 +41,7 @@ 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.spring.FederationUser;
-import
org.apache.cxf.fediz.spring.web.authentication.FederationAuthenticationToken;
+import
org.apache.cxf.fediz.spring.authentication.FederationAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
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=1453003&r1=1453002&r2=1453003&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
Tue Mar 5 21:21:04 2013
@@ -31,26 +31,38 @@ http://www.springframework.org/schema/co
<sec:authentication-provider ref="federationAuthProvider" />
</sec:authentication-manager>
- <bean id="fedizConfig"
class="org.apache.cxf.fediz.spring.web.authentication.FederationConfigImpl"
init-method="init"
+ <bean id="fedizConfig"
class="org.apache.cxf.fediz.spring.FederationConfigImpl" init-method="init"
p:configFile="WEB-INF/fediz_config.xml" />
<bean id="federationEntryPoint"
-
class="org.apache.cxf.fediz.spring.web.authentication.FederationAuthenticationEntryPoint"
+
class="org.apache.cxf.fediz.spring.web.FederationAuthenticationEntryPoint"
p:federationConfig-ref="fedizConfig" />
+<!-- Works without
org.springframework.security.web.authentication.session.SessionFixationProtectionStrategy
as well -->
+<!--
<bean id="federationFilter"
-
class="org.apache.cxf.fediz.spring.web.authentication.FederationAuthenticationFilter"
+ class="org.apache.cxf.fediz.spring.web.FederationAuthenticationFilter"
p:authenticationManager-ref="authManager"
p:sessionAuthenticationStrategy-ref="sas">
<property name="authenticationFailureHandler">
<bean
class="org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler"
/>
</property>
</bean>
+ -->
+
+ <bean id="federationFilter"
+ class="org.apache.cxf.fediz.spring.web.FederationAuthenticationFilter"
+ p:authenticationManager-ref="authManager">
- <bean id="federationAuthProvider"
class="org.apache.cxf.fediz.spring.web.authentication.FederationAuthenticationProvider"
+ <property name="authenticationFailureHandler">
+ <bean
class="org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler"
/>
+ </property>
+ </bean>
+
+ <bean id="federationAuthProvider"
class="org.apache.cxf.fediz.spring.authentication.FederationAuthenticationProvider"
p:federationConfig-ref="fedizConfig">
<property name="authenticationUserDetailsService">
- <bean
class="org.apache.cxf.fediz.spring.web.authentication.GrantedAuthoritiesUserDetailsFederationService"/>
+ <bean
class="org.apache.cxf.fediz.spring.authentication.GrantedAuthoritiesUserDetailsFederationService"/>
</property>
</bean>
Copied:
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/FederationConfig.java
(from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationConfig.java)
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/FederationConfig.java?p2=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/FederationConfig.java&p1=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationConfig.java&r1=1452991&r2=1453003&rev=1453003&view=diff
==============================================================================
---
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationConfig.java
(original)
+++
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/FederationConfig.java
Tue Mar 5 21:21:04 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.fediz.spring.web.authentication;
+package org.apache.cxf.fediz.spring;
import java.util.List;
import org.apache.cxf.fediz.core.config.FederationContext;
Copied:
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/FederationConfigImpl.java
(from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationConfigImpl.java)
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/FederationConfigImpl.java?p2=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/FederationConfigImpl.java&p1=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationConfigImpl.java&r1=1452991&r2=1453003&rev=1453003&view=diff
==============================================================================
---
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationConfigImpl.java
(original)
+++
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/FederationConfigImpl.java
Tue Mar 5 21:21:04 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.fediz.spring.web.authentication;
+package org.apache.cxf.fediz.spring;
import java.util.List;
Copied:
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/AbstractFederationUserDetailsService.java
(from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/AbstractFederationUserDetailsService.java)
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/AbstractFederationUserDetailsService.java?p2=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/AbstractFederationUserDetailsService.java&p1=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/AbstractFederationUserDetailsService.java&r1=1452991&r2=1453003&rev=1453003&view=diff
==============================================================================
---
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/AbstractFederationUserDetailsService.java
(original)
+++
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/AbstractFederationUserDetailsService.java
Tue Mar 5 21:21:04 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.fediz.spring.web.authentication;
+package org.apache.cxf.fediz.spring.authentication;
import org.apache.cxf.fediz.core.FederationResponse;
import
org.springframework.security.core.userdetails.AuthenticationUserDetailsService;
Copied:
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationProvider.java
(from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationAuthenticationProvider.java)
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationProvider.java?p2=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationProvider.java&p1=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationAuthenticationProvider.java&r1=1452991&r2=1453003&rev=1453003&view=diff
==============================================================================
---
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationAuthenticationProvider.java
(original)
+++
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationProvider.java
Tue Mar 5 21:21:04 2013
@@ -17,12 +17,13 @@
* under the License.
*/
-package org.apache.cxf.fediz.spring.web.authentication;
+package org.apache.cxf.fediz.spring.authentication;
import org.apache.cxf.fediz.core.FederationProcessor;
import org.apache.cxf.fediz.core.FederationProcessorImpl;
import org.apache.cxf.fediz.core.FederationRequest;
import org.apache.cxf.fediz.core.FederationResponse;
+import org.apache.cxf.fediz.spring.FederationConfig;
import org.apache.cxf.fediz.spring.SpringFedizMessageSource;
import org.slf4j.Logger;
Copied:
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java
(from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationAuthenticationToken.java)
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java?p2=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java&p1=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationAuthenticationToken.java&r1=1452991&r2=1453003&rev=1453003&view=diff
==============================================================================
---
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationAuthenticationToken.java
(original)
+++
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java
Tue Mar 5 21:21:04 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.fediz.spring.web.authentication;
+package org.apache.cxf.fediz.spring.authentication;
import java.io.Serializable;
import java.util.Collection;
Copied:
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationResponseAuthenticationToken.java
(from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationResponseAuthenticationToken.java)
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationResponseAuthenticationToken.java?p2=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationResponseAuthenticationToken.java&p1=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationResponseAuthenticationToken.java&r1=1452991&r2=1453003&rev=1453003&view=diff
==============================================================================
---
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationResponseAuthenticationToken.java
(original)
+++
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationResponseAuthenticationToken.java
Tue Mar 5 21:21:04 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.fediz.spring.web.authentication;
+package org.apache.cxf.fediz.spring.authentication;
import java.util.ArrayList;
Copied:
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/GrantedAuthoritiesUserDetailsFederationService.java
(from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/GrantedAuthoritiesUserDetailsFederationService.java)
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/GrantedAuthoritiesUserDetailsFederationService.java?p2=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/GrantedAuthoritiesUserDetailsFederationService.java&p1=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/GrantedAuthoritiesUserDetailsFederationService.java&r1=1452991&r2=1453003&rev=1453003&view=diff
==============================================================================
---
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/GrantedAuthoritiesUserDetailsFederationService.java
(original)
+++
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/GrantedAuthoritiesUserDetailsFederationService.java
Tue Mar 5 21:21:04 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.fediz.spring.web.authentication;
+package org.apache.cxf.fediz.spring.authentication;
import java.util.*;
Copied:
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/preauth/FederationPreAuthenticatedProcessingFilter.java
(from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/FederationPreAuthenticatedProcessingFilter.java)
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/preauth/FederationPreAuthenticatedProcessingFilter.java?p2=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/preauth/FederationPreAuthenticatedProcessingFilter.java&p1=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/FederationPreAuthenticatedProcessingFilter.java&r1=1452991&r2=1453003&rev=1453003&view=diff
==============================================================================
---
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/FederationPreAuthenticatedProcessingFilter.java
(original)
+++
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/preauth/FederationPreAuthenticatedProcessingFilter.java
Tue Mar 5 21:21:04 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.fediz.spring;
+package org.apache.cxf.fediz.spring.preauth;
import javax.servlet.http.HttpServletRequest;
Copied:
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService.java
(from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService.java)
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService.java?p2=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService.java&p1=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService.java&r1=1452991&r2=1453003&rev=1453003&view=diff
==============================================================================
---
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService.java
(original)
+++
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService.java
Tue Mar 5 21:21:04 2013
@@ -16,12 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.fediz.spring;
+package org.apache.cxf.fediz.spring.preauth;
import java.util.*;
import org.apache.cxf.fediz.core.ClaimCollection;
import org.apache.cxf.fediz.core.FederationPrincipal;
+import org.apache.cxf.fediz.spring.FederationUser;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.core.GrantedAuthority;
Copied:
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationEntryPoint.java
(from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationAuthenticationEntryPoint.java)
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationEntryPoint.java?p2=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationEntryPoint.java&p1=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationAuthenticationEntryPoint.java&r1=1452991&r2=1453003&rev=1453003&view=diff
==============================================================================
---
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationAuthenticationEntryPoint.java
(original)
+++
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationEntryPoint.java
Tue Mar 5 21:21:04 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.fediz.spring.web.authentication;
+package org.apache.cxf.fediz.spring.web;
import java.io.IOException;
@@ -29,6 +29,7 @@ import org.apache.cxf.fediz.core.Federat
import org.apache.cxf.fediz.core.FederationProcessorImpl;
import org.apache.cxf.fediz.core.config.FederationContext;
import org.apache.cxf.fediz.core.exception.ProcessingException;
+import org.apache.cxf.fediz.spring.FederationConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied:
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationFilter.java
(from r1452991,
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationAuthenticationFilter.java)
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationFilter.java?p2=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationFilter.java&p1=cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationAuthenticationFilter.java&r1=1452991&r2=1453003&rev=1453003&view=diff
==============================================================================
---
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/authentication/FederationAuthenticationFilter.java
(original)
+++
cxf/fediz/trunk/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationFilter.java
Tue Mar 5 21:21:04 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.fediz.spring.web.authentication;
+package org.apache.cxf.fediz.spring.web;
import java.io.IOException;
