You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/03/26 14:58:22 UTC
[cxf-fediz] branch master updated: Updating to CXF 3.2.4
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
The following commit(s) were added to refs/heads/master by this push:
new 115b416 Updating to CXF 3.2.4
115b416 is described below
commit 115b416ec4a734b14a8ca791f53dd5068b578944
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Mar 26 15:58:12 2018 +0100
Updating to CXF 3.2.4
---
.../apache/cxf/fediz/example/FederationServlet.java | 1 -
.../apache/cxf/fediz/example/FederationServlet.java | 1 -
.../cxf/fediz/examples/service/GreeterImpl.java | 1 -
.../org/apache/cxf/fediz/core/TokenValidator.java | 1 +
.../handler/AuthentcationTypeCallbackHandler.java | 3 +--
.../fediz/core/processor/FederationProcessorImpl.java | 1 +
.../cxf/fediz/core/processor/FedizProcessor.java | 1 +
.../cxf/fediz/core/processor/FedizResponse.java | 1 +
.../cxf/fediz/core/saml/SAMLTokenValidator.java | 1 +
.../core/samlsso/SAMLProtocolResponseValidator.java | 1 +
.../cxf/fediz/core/servlet/FederationFilter.java | 1 +
.../cxf/fediz/cxf/plugin/CXFFedizPrincipal.java | 1 +
.../fediz/cxf/plugin/state/EHCacheSPStateManager.java | 1 -
.../cxf/fediz/cxf/web/ThreadLocalCallbackHandler.java | 1 -
.../cxf/fediz/jetty9/FederationUserIdentity.java | 1 +
.../authentication/FederationAuthenticationToken.java | 1 +
...rantedAuthoritiesUserDetailsFederationService.java | 1 -
.../authentication/FederationAuthenticationToken.java | 1 +
...rantedAuthoritiesUserDetailsFederationService.java | 1 -
.../cxf/fediz/tomcat8/FederationPrincipalImpl.java | 1 +
pom.xml | 19 +++++++++++++++----
.../apache/cxf/fediz/service/idp/FedizEntryPoint.java | 1 -
.../apache/cxf/fediz/service/idp/MetadataServlet.java | 1 +
.../service/idp/STSPreAuthAuthenticationProvider.java | 1 +
.../idp/kerberos/KerberosServiceRequestToken.java | 3 ++-
.../fediz/service/idp/metadata/IdpMetadataWriter.java | 1 +
.../service/idp/metadata/ServiceMetadataWriter.java | 1 +
.../protocols/ApplicationSAMLSSOProtocolHandler.java | 1 -
.../protocols/ApplicationWSFedProtocolHandler.java | 1 -
.../idp/protocols/TrustedIdpSAMLProtocolHandler.java | 1 +
.../idp/protocols/TrustedIdpWSFedProtocolHandler.java | 1 +
.../fediz/service/idp/rest/ApplicationService.java | 1 -
.../cxf/fediz/service/idp/rest/ClaimService.java | 1 -
.../fediz/service/idp/rest/EntitlementService.java | 1 -
.../apache/cxf/fediz/service/idp/rest/IdpService.java | 1 -
.../service/idp/rest/RestServiceExceptionMapper.java | 1 +
.../cxf/fediz/service/idp/rest/RoleService.java | 1 -
.../cxf/fediz/service/idp/rest/TrustedIdpService.java | 1 -
.../idp/service/jpa/ApplicationDAOJPAImpl.java | 1 -
.../idp/service/jpa/ApplicationProtocolSupported.java | 9 ++++-----
.../service/idp/service/jpa/ClaimDAOJPAImpl.java | 1 -
.../service/idp/service/jpa/ConfigServiceJPA.java | 2 --
.../idp/service/jpa/EntitlementDAOJPAImpl.java | 1 -
.../fediz/service/idp/service/jpa/IdpDAOJPAImpl.java | 1 -
.../fediz/service/idp/service/jpa/RoleDAOJPAImpl.java | 1 -
.../service/idp/service/jpa/TrustedIdpDAOJPAImpl.java | 1 -
.../idp/service/jpa/TrustedIdpProtocolSupported.java | 9 ++++-----
.../security/GrantedAuthorityEntitlements.java | 2 --
.../fediz/service/sts/FedizX509DelegationHandler.java | 2 +-
.../cxf/fediz/samlsso/example/BasicAuthFilter.java | 1 +
.../cxf/fediz/samlsso/service/DoubleItService.java | 1 -
.../java/org/apache/cxf/fediz/example/Service.java | 1 +
.../apache/cxf/fediz/example/FederationServlet.java | 1 -
.../apache/cxf/fediz/example/FederationServlet.java | 1 -
.../apache/cxf/fediz/example/FederationServlet.java | 1 -
55 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/examples/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java b/examples/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
index 90afce4..4a21848 100644
--- a/examples/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
+++ b/examples/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
@@ -43,7 +43,6 @@ import org.apache.cxf.fediz.core.Claim;
import org.apache.cxf.fediz.core.ClaimCollection;
import org.apache.cxf.fediz.core.FedizPrincipal;
import org.apache.cxf.fediz.core.SecurityTokenThreadLocal;
-
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
diff --git a/examples/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java b/examples/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
index 33443a1..35ca27e 100644
--- a/examples/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
+++ b/examples/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
@@ -42,7 +42,6 @@ import org.apache.cxf.fediz.core.ClaimCollection;
import org.apache.cxf.fediz.core.SecurityTokenThreadLocal;
import org.apache.cxf.fediz.spring.FederationUser;
import org.apache.cxf.fediz.spring.authentication.FederationAuthenticationToken;
-
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.context.SecurityContextHolder;
diff --git a/examples/wsclientWebapp/webservice/service/src/main/java/org/apache/cxf/fediz/examples/service/GreeterImpl.java b/examples/wsclientWebapp/webservice/service/src/main/java/org/apache/cxf/fediz/examples/service/GreeterImpl.java
index e3a2983..38f71ba 100644
--- a/examples/wsclientWebapp/webservice/service/src/main/java/org/apache/cxf/fediz/examples/service/GreeterImpl.java
+++ b/examples/wsclientWebapp/webservice/service/src/main/java/org/apache/cxf/fediz/examples/service/GreeterImpl.java
@@ -25,7 +25,6 @@ import javax.annotation.Resource;
import javax.xml.ws.WebServiceContext;
import org.apache.hello_world_soap_http.Greeter;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenValidator.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenValidator.java
index f62bb4c..fa2d041 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenValidator.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenValidator.java
@@ -20,6 +20,7 @@
package org.apache.cxf.fediz.core;
import org.w3c.dom.Element;
+
import org.apache.cxf.fediz.core.config.FedizContext;
import org.apache.cxf.fediz.core.exception.ProcessingException;
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/AuthentcationTypeCallbackHandler.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/AuthentcationTypeCallbackHandler.java
index a4d5c51..850f7f8 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/AuthentcationTypeCallbackHandler.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/AuthentcationTypeCallbackHandler.java
@@ -25,7 +25,6 @@ import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
import org.apache.cxf.fediz.core.spi.WAuthCallback;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,4 +52,4 @@ public class AuthentcationTypeCallbackHandler implements CallbackHandler {
}
}
-}
\ No newline at end of file
+}
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FederationProcessorImpl.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FederationProcessorImpl.java
index 708c60d..7067db9 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FederationProcessorImpl.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FederationProcessorImpl.java
@@ -46,6 +46,7 @@ import javax.servlet.http.HttpServletRequest;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.fediz.core.FederationConstants;
import org.apache.cxf.fediz.core.RequestState;
import org.apache.cxf.fediz.core.TokenValidator;
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FedizProcessor.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FedizProcessor.java
index 0e7ea7b..e01ebb5 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FedizProcessor.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FedizProcessor.java
@@ -22,6 +22,7 @@ package org.apache.cxf.fediz.core.processor;
import javax.servlet.http.HttpServletRequest;
import org.w3c.dom.Document;
+
import org.apache.cxf.fediz.core.config.FedizContext;
import org.apache.cxf.fediz.core.exception.ProcessingException;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FedizResponse.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FedizResponse.java
index 3a07b30..7c7c5a0 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FedizResponse.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FedizResponse.java
@@ -32,6 +32,7 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.stream.XMLStreamException;
import org.w3c.dom.Element;
+
import org.xml.sax.SAXException;
import org.apache.cxf.fediz.core.Claim;
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java
index 586bf01..9172572 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java
@@ -30,6 +30,7 @@ import java.util.StringTokenizer;
import java.util.regex.Pattern;
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.ClaimTypes;
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/SAMLProtocolResponseValidator.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/SAMLProtocolResponseValidator.java
index 3d69147..e20eb0f 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/SAMLProtocolResponseValidator.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/SAMLProtocolResponseValidator.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.regex.Pattern;
import org.w3c.dom.Document;
+
import org.apache.cxf.fediz.core.config.CertificateValidationMethod;
import org.apache.cxf.fediz.core.config.FedizContext;
import org.apache.cxf.fediz.core.config.TrustManager;
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/servlet/FederationFilter.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/servlet/FederationFilter.java
index ff90004..270dd02 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/servlet/FederationFilter.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/servlet/FederationFilter.java
@@ -31,6 +31,7 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import org.w3c.dom.Element;
+
import org.apache.cxf.fediz.core.FedizPrincipal;
import org.apache.cxf.fediz.core.SecurityTokenThreadLocal;
diff --git a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/CXFFedizPrincipal.java b/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/CXFFedizPrincipal.java
index 325de9c..0dccda4 100644
--- a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/CXFFedizPrincipal.java
+++ b/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/CXFFedizPrincipal.java
@@ -22,6 +22,7 @@ import java.util.Collections;
import java.util.List;
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.FedizPrincipal;
diff --git a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/state/EHCacheSPStateManager.java b/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/state/EHCacheSPStateManager.java
index 0b7d099..27c4bc6 100644
--- a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/state/EHCacheSPStateManager.java
+++ b/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/state/EHCacheSPStateManager.java
@@ -26,7 +26,6 @@ import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Ehcache;
import net.sf.ehcache.Element;
import net.sf.ehcache.config.CacheConfiguration;
-
import org.apache.cxf.fediz.core.RequestState;
import org.apache.wss4j.common.cache.EHCacheManagerHolder;
import org.apache.wss4j.common.util.Loader;
diff --git a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/web/ThreadLocalCallbackHandler.java b/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/web/ThreadLocalCallbackHandler.java
index a905641..c9858c2 100644
--- a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/web/ThreadLocalCallbackHandler.java
+++ b/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/web/ThreadLocalCallbackHandler.java
@@ -31,7 +31,6 @@ import org.w3c.dom.Element;
import org.apache.cxf.fediz.core.SecurityTokenThreadLocal;
import org.apache.cxf.ws.security.trust.delegation.DelegationCallback;
import org.apache.wss4j.common.util.DOM2Writer;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/plugins/jetty9/src/main/java/org/apache/cxf/fediz/jetty9/FederationUserIdentity.java b/plugins/jetty9/src/main/java/org/apache/cxf/fediz/jetty9/FederationUserIdentity.java
index 9b71291..07018fc 100644
--- a/plugins/jetty9/src/main/java/org/apache/cxf/fediz/jetty9/FederationUserIdentity.java
+++ b/plugins/jetty9/src/main/java/org/apache/cxf/fediz/jetty9/FederationUserIdentity.java
@@ -27,6 +27,7 @@ import java.util.Arrays;
import javax.security.auth.Subject;
import org.w3c.dom.Element;
+
import org.apache.cxf.fediz.core.processor.FedizResponse;
import org.eclipse.jetty.server.UserIdentity;
diff --git a/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java b/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java
index 5ed8d57..816db19 100644
--- a/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java
+++ b/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java
@@ -25,6 +25,7 @@ import java.util.Collections;
import java.util.List;
import org.w3c.dom.Element;
+
import org.apache.cxf.fediz.core.ClaimCollection;
import org.apache.cxf.fediz.core.FedizPrincipal;
import org.apache.cxf.fediz.core.processor.FedizResponse;
diff --git a/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService.java b/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService.java
index 2551d0e..cf2dc3c 100644
--- a/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService.java
+++ b/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService.java
@@ -30,7 +30,6 @@ import org.springframework.security.core.authority.GrantedAuthoritiesContainer;
import org.springframework.security.core.userdetails.AuthenticationUserDetailsService;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken;
-
import org.springframework.util.Assert;
/**
diff --git a/plugins/spring3/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java b/plugins/spring3/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java
index 5ed8d57..816db19 100644
--- a/plugins/spring3/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java
+++ b/plugins/spring3/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java
@@ -25,6 +25,7 @@ import java.util.Collections;
import java.util.List;
import org.w3c.dom.Element;
+
import org.apache.cxf.fediz.core.ClaimCollection;
import org.apache.cxf.fediz.core.FedizPrincipal;
import org.apache.cxf.fediz.core.processor.FedizResponse;
diff --git a/plugins/spring3/src/main/java/org/apache/cxf/fediz/spring/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService.java b/plugins/spring3/src/main/java/org/apache/cxf/fediz/spring/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService.java
index 2551d0e..cf2dc3c 100644
--- a/plugins/spring3/src/main/java/org/apache/cxf/fediz/spring/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService.java
+++ b/plugins/spring3/src/main/java/org/apache/cxf/fediz/spring/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService.java
@@ -30,7 +30,6 @@ import org.springframework.security.core.authority.GrantedAuthoritiesContainer;
import org.springframework.security.core.userdetails.AuthenticationUserDetailsService;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken;
-
import org.springframework.util.Assert;
/**
diff --git a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationPrincipalImpl.java b/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationPrincipalImpl.java
index 81408c7..4e019a8 100644
--- a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationPrincipalImpl.java
+++ b/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationPrincipalImpl.java
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.List;
import org.w3c.dom.Element;
+
import org.apache.catalina.realm.GenericPrincipal;
import org.apache.cxf.fediz.core.Claim;
import org.apache.cxf.fediz.core.ClaimCollection;
diff --git a/pom.xml b/pom.xml
index 4b147ff..c7b4c23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,8 +43,8 @@
<commons.logging.version>1.2</commons.logging.version>
<commons.io.version>2.5</commons.io.version>
<commons.validator.version>1.6</commons.validator.version>
- <cxf.version>3.2.3</cxf.version>
- <cxf.build-utils.version>3.3.0</cxf.build-utils.version>
+ <cxf.version>3.2.4</cxf.version>
+ <cxf.build-utils.version>3.4.0</cxf.build-utils.version>
<dbcp.version>2.1.1</dbcp.version>
<easymock.version>3.4</easymock.version>
<ehcache.version>2.10.4</ehcache.version>
@@ -455,13 +455,25 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
+ <version>3.0.0</version>
<dependencies>
<dependency>
<groupId>org.apache.cxf.build-utils</groupId>
<artifactId>cxf-buildtools</artifactId>
<version>${cxf.build-utils.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>8.7</version>
+ <exclusions>
+ <!-- MCHECKSTYLE-156 -->
+ <exclusion>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<configuration>
<encoding>UTF-8</encoding>
@@ -477,7 +489,6 @@
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
<suppressionsLocation>${fediz.resources.base.path}cxf-checkstyle-suppressions.xml</suppressionsLocation>
- <sourceDirectory>${basedir}/src</sourceDirectory>
<excludes>**/archetype-resources/**/*.java</excludes>
<excludes>**/jaxb/**/*.java</excludes>
</configuration>
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/FedizEntryPoint.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/FedizEntryPoint.java
index dd121fb..f00a9f4 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/FedizEntryPoint.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/FedizEntryPoint.java
@@ -34,7 +34,6 @@ import org.apache.cxf.fediz.service.idp.domain.Idp;
import org.apache.cxf.fediz.service.idp.service.ConfigService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.ApplicationContext;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/MetadataServlet.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/MetadataServlet.java
index f09bd08..18441c0 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/MetadataServlet.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/MetadataServlet.java
@@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.w3c.dom.Document;
+
import org.apache.cxf.fediz.service.idp.domain.Idp;
import org.apache.cxf.fediz.service.idp.domain.TrustedIdp;
import org.apache.cxf.fediz.service.idp.metadata.IdpMetadataWriter;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/STSPreAuthAuthenticationProvider.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/STSPreAuthAuthenticationProvider.java
index 38bfa7c..e985875 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/STSPreAuthAuthenticationProvider.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/STSPreAuthAuthenticationProvider.java
@@ -24,6 +24,7 @@ import java.util.List;
import javax.xml.namespace.QName;
import org.w3c.dom.Document;
+
import org.apache.cxf.Bus;
import org.apache.cxf.fediz.core.util.DOMUtils;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/kerberos/KerberosServiceRequestToken.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/kerberos/KerberosServiceRequestToken.java
index b1a2cbf..824b175 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/kerberos/KerberosServiceRequestToken.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/kerberos/KerberosServiceRequestToken.java
@@ -35,6 +35,7 @@ package org.apache.cxf.fediz.service.idp.kerberos;
import java.util.Arrays;
import java.util.Collection;
+
import org.springframework.security.authentication.AbstractAuthenticationToken;
import org.springframework.security.core.GrantedAuthority;
@@ -147,4 +148,4 @@ public class KerberosServiceRequestToken extends AbstractAuthenticationToken {
}
return null;
}
-}
\ No newline at end of file
+}
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/metadata/IdpMetadataWriter.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/metadata/IdpMetadataWriter.java
index f47fb60..f23c363 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/metadata/IdpMetadataWriter.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/metadata/IdpMetadataWriter.java
@@ -26,6 +26,7 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
import org.w3c.dom.Document;
+
import org.apache.cxf.fediz.core.util.CertsUtils;
import org.apache.cxf.fediz.core.util.SignatureUtils;
import org.apache.cxf.fediz.service.idp.domain.Claim;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/metadata/ServiceMetadataWriter.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/metadata/ServiceMetadataWriter.java
index 75adec7..66a97a8 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/metadata/ServiceMetadataWriter.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/metadata/ServiceMetadataWriter.java
@@ -27,6 +27,7 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
import org.w3c.dom.Document;
+
import org.apache.cxf.fediz.core.exception.ProcessingException;
import org.apache.cxf.fediz.core.util.CertsUtils;
import org.apache.cxf.fediz.core.util.SignatureUtils;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/ApplicationSAMLSSOProtocolHandler.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/ApplicationSAMLSSOProtocolHandler.java
index 5d7307a..56805c4 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/ApplicationSAMLSSOProtocolHandler.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/ApplicationSAMLSSOProtocolHandler.java
@@ -22,7 +22,6 @@ package org.apache.cxf.fediz.service.idp.protocols;
import javax.servlet.http.HttpServletRequest;
import org.apache.cxf.fediz.service.idp.spi.ApplicationProtocolHandler;
-
import org.springframework.stereotype.Component;
import org.springframework.webflow.execution.RequestContext;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/ApplicationWSFedProtocolHandler.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/ApplicationWSFedProtocolHandler.java
index d583823..0ab785e 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/ApplicationWSFedProtocolHandler.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/ApplicationWSFedProtocolHandler.java
@@ -22,7 +22,6 @@ package org.apache.cxf.fediz.service.idp.protocols;
import javax.servlet.http.HttpServletRequest;
import org.apache.cxf.fediz.service.idp.spi.ApplicationProtocolHandler;
-
import org.springframework.stereotype.Component;
import org.springframework.webflow.execution.RequestContext;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpSAMLProtocolHandler.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpSAMLProtocolHandler.java
index b3371a0..3a2764e 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpSAMLProtocolHandler.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpSAMLProtocolHandler.java
@@ -42,6 +42,7 @@ import javax.ws.rs.core.UriBuilder;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.util.Base64Exception;
import org.apache.cxf.common.util.Base64Utility;
import org.apache.cxf.common.util.StringUtils;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpWSFedProtocolHandler.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpWSFedProtocolHandler.java
index e531285..c3b75fc 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpWSFedProtocolHandler.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpWSFedProtocolHandler.java
@@ -27,6 +27,7 @@ import java.security.cert.X509Certificate;
import java.util.Collections;
import org.w3c.dom.Element;
+
import org.apache.cxf.fediz.core.FederationConstants;
import org.apache.cxf.fediz.core.config.FedizContext;
import org.apache.cxf.fediz.core.config.TrustManager;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/ApplicationService.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/ApplicationService.java
index cb1365f..03b0489 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/ApplicationService.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/ApplicationService.java
@@ -38,7 +38,6 @@ import javax.ws.rs.core.UriInfo;
import org.apache.cxf.fediz.service.idp.domain.Application;
import org.apache.cxf.fediz.service.idp.domain.RequestClaim;
-
import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/ClaimService.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/ClaimService.java
index ce0d1a9..a8e2d2a 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/ClaimService.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/ClaimService.java
@@ -35,7 +35,6 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.cxf.fediz.service.idp.domain.Claim;
-
import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/EntitlementService.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/EntitlementService.java
index 951f332..c089efc 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/EntitlementService.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/EntitlementService.java
@@ -35,7 +35,6 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.cxf.fediz.service.idp.domain.Entitlement;
-
import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/IdpService.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/IdpService.java
index c51fb5c..0af42ca 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/IdpService.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/IdpService.java
@@ -40,7 +40,6 @@ import org.apache.cxf.fediz.service.idp.domain.Application;
import org.apache.cxf.fediz.service.idp.domain.Claim;
import org.apache.cxf.fediz.service.idp.domain.Idp;
import org.apache.cxf.fediz.service.idp.domain.TrustedIdp;
-
import org.springframework.security.access.prepost.PreAuthorize;
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/RestServiceExceptionMapper.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/RestServiceExceptionMapper.java
index b305e0f..b1ed3b1 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/RestServiceExceptionMapper.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/RestServiceExceptionMapper.java
@@ -25,6 +25,7 @@ import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.dao.DataIntegrityViolationException;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/RoleService.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/RoleService.java
index f5d1313..e1ea83f 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/RoleService.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/RoleService.java
@@ -38,7 +38,6 @@ import javax.ws.rs.core.UriInfo;
import org.apache.cxf.fediz.service.idp.domain.Entitlement;
import org.apache.cxf.fediz.service.idp.domain.Role;
-
import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/TrustedIdpService.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/TrustedIdpService.java
index 01578a2..6ba59f1 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/TrustedIdpService.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/rest/TrustedIdpService.java
@@ -35,7 +35,6 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.cxf.fediz.service.idp.domain.TrustedIdp;
-
import org.springframework.security.access.prepost.PreAuthorize;
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPAImpl.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPAImpl.java
index e5b3dac..42962e4 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPAImpl.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPAImpl.java
@@ -32,7 +32,6 @@ import org.apache.cxf.fediz.service.idp.domain.Claim;
import org.apache.cxf.fediz.service.idp.domain.RequestClaim;
import org.apache.cxf.fediz.service.idp.service.ApplicationDAO;
import org.apache.cxf.fediz.service.idp.service.ClaimDAO;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationProtocolSupported.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationProtocolSupported.java
index 6dc69a5..e56a0bc 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationProtocolSupported.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationProtocolSupported.java
@@ -23,15 +23,14 @@ import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
-
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
@Target({ METHOD, FIELD, ANNOTATION_TYPE })
@Retention(RUNTIME)
@Constraint(validatedBy = ApplicationIdpProtocolSupportValidator.class)
@@ -44,4 +43,4 @@ public @interface ApplicationProtocolSupported {
Class<? extends Payload>[] payload() default { };
-}
\ No newline at end of file
+}
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ClaimDAOJPAImpl.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ClaimDAOJPAImpl.java
index 8354d50..bddeb43 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ClaimDAOJPAImpl.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ClaimDAOJPAImpl.java
@@ -28,7 +28,6 @@ import javax.persistence.Query;
import org.apache.cxf.fediz.service.idp.domain.Claim;
import org.apache.cxf.fediz.service.idp.service.ClaimDAO;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Repository;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ConfigServiceJPA.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ConfigServiceJPA.java
index d356c45..e70e58d 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ConfigServiceJPA.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ConfigServiceJPA.java
@@ -26,10 +26,8 @@ import java.util.Set;
import org.apache.cxf.fediz.service.idp.domain.Idp;
import org.apache.cxf.fediz.service.idp.rest.IdpService;
import org.apache.cxf.fediz.service.idp.service.ConfigService;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/EntitlementDAOJPAImpl.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/EntitlementDAOJPAImpl.java
index 56c70ce..6a4c5c4 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/EntitlementDAOJPAImpl.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/EntitlementDAOJPAImpl.java
@@ -27,7 +27,6 @@ import javax.persistence.Query;
import org.apache.cxf.fediz.service.idp.domain.Entitlement;
import org.apache.cxf.fediz.service.idp.service.EntitlementDAO;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Repository;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPAImpl.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPAImpl.java
index ee5b052..44ba864 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPAImpl.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpDAOJPAImpl.java
@@ -33,7 +33,6 @@ import org.apache.cxf.fediz.service.idp.domain.Claim;
import org.apache.cxf.fediz.service.idp.domain.Idp;
import org.apache.cxf.fediz.service.idp.domain.TrustedIdp;
import org.apache.cxf.fediz.service.idp.service.IdpDAO;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Repository;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/RoleDAOJPAImpl.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/RoleDAOJPAImpl.java
index ac70772..3066bf9 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/RoleDAOJPAImpl.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/RoleDAOJPAImpl.java
@@ -30,7 +30,6 @@ import javax.persistence.Query;
import org.apache.cxf.fediz.service.idp.domain.Entitlement;
import org.apache.cxf.fediz.service.idp.domain.Role;
import org.apache.cxf.fediz.service.idp.service.RoleDAO;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Repository;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPAImpl.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPAImpl.java
index fbb654a..4da5279 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPAImpl.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpDAOJPAImpl.java
@@ -27,7 +27,6 @@ import javax.persistence.Query;
import org.apache.cxf.fediz.service.idp.domain.TrustedIdp;
import org.apache.cxf.fediz.service.idp.service.TrustedIdpDAO;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Repository;
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpProtocolSupported.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpProtocolSupported.java
index 9c32af3..d0fdf3b 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpProtocolSupported.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpProtocolSupported.java
@@ -23,15 +23,14 @@ import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
-
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
@Target({ METHOD, FIELD, ANNOTATION_TYPE })
@Retention(RUNTIME)
@Constraint(validatedBy = TrustedIdpProtocolSupportValidator.class)
@@ -44,4 +43,4 @@ public @interface TrustedIdpProtocolSupported {
Class<? extends Payload>[] payload() default { };
-}
\ No newline at end of file
+}
diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/security/GrantedAuthorityEntitlements.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/security/GrantedAuthorityEntitlements.java
index 4af7ad1..4164b9b 100644
--- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/security/GrantedAuthorityEntitlements.java
+++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/security/GrantedAuthorityEntitlements.java
@@ -32,10 +32,8 @@ import javax.servlet.ServletResponse;
import org.apache.cxf.fediz.service.idp.domain.Entitlement;
import org.apache.cxf.fediz.service.idp.domain.Role;
import org.apache.cxf.fediz.service.idp.service.RoleDAO;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
diff --git a/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/FedizX509DelegationHandler.java b/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/FedizX509DelegationHandler.java
index f85a337..1a0fc3d 100644
--- a/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/FedizX509DelegationHandler.java
+++ b/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/FedizX509DelegationHandler.java
@@ -19,13 +19,13 @@
package org.apache.cxf.fediz.service.sts;
import org.w3c.dom.Element;
+
import org.apache.cxf.sts.request.ReceivedToken;
import org.apache.cxf.sts.request.ReceivedToken.STATE;
import org.apache.cxf.sts.token.delegation.TokenDelegationHandler;
import org.apache.cxf.sts.token.delegation.TokenDelegationParameters;
import org.apache.cxf.sts.token.delegation.TokenDelegationResponse;
import org.apache.wss4j.dom.WSConstants;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/systests/federation/samlIdpWebapp/src/main/java/org/apache/cxf/fediz/samlsso/example/BasicAuthFilter.java b/systests/federation/samlIdpWebapp/src/main/java/org/apache/cxf/fediz/samlsso/example/BasicAuthFilter.java
index 32957b6..54dea8b 100644
--- a/systests/federation/samlIdpWebapp/src/main/java/org/apache/cxf/fediz/samlsso/example/BasicAuthFilter.java
+++ b/systests/federation/samlIdpWebapp/src/main/java/org/apache/cxf/fediz/samlsso/example/BasicAuthFilter.java
@@ -27,6 +27,7 @@ import javax.ws.rs.container.ContainerRequestFilter;
import javax.ws.rs.core.Response;
import org.w3c.dom.Document;
+
import org.apache.cxf.configuration.security.AuthorizationPolicy;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
diff --git a/systests/federation/samlWebapp/src/main/java/org/apache/cxf/fediz/samlsso/service/DoubleItService.java b/systests/federation/samlWebapp/src/main/java/org/apache/cxf/fediz/samlsso/service/DoubleItService.java
index f69f595..5763226 100644
--- a/systests/federation/samlWebapp/src/main/java/org/apache/cxf/fediz/samlsso/service/DoubleItService.java
+++ b/systests/federation/samlWebapp/src/main/java/org/apache/cxf/fediz/samlsso/service/DoubleItService.java
@@ -19,7 +19,6 @@
package org.apache.cxf.fediz.samlsso.service;
import javax.annotation.security.RolesAllowed;
-
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
diff --git a/systests/webapps/cxfWebapp/src/main/java/org/apache/cxf/fediz/example/Service.java b/systests/webapps/cxfWebapp/src/main/java/org/apache/cxf/fediz/example/Service.java
index b50511d..f2375c0 100644
--- a/systests/webapps/cxfWebapp/src/main/java/org/apache/cxf/fediz/example/Service.java
+++ b/systests/webapps/cxfWebapp/src/main/java/org/apache/cxf/fediz/example/Service.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.UriInfo;
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.FedizPrincipal;
diff --git a/systests/webapps/spring3Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java b/systests/webapps/spring3Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
index c846ca3..1153b6a 100644
--- a/systests/webapps/spring3Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
+++ b/systests/webapps/spring3Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
@@ -36,7 +36,6 @@ import org.apache.cxf.fediz.core.Claim;
import org.apache.cxf.fediz.core.ClaimCollection;
import org.apache.cxf.fediz.core.SecurityTokenThreadLocal;
import org.apache.cxf.fediz.spring.authentication.FederationAuthenticationToken;
-
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.context.SecurityContextHolder;
diff --git a/systests/webapps/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java b/systests/webapps/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
index 1d2cc7a..4d1f597 100644
--- a/systests/webapps/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
+++ b/systests/webapps/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
@@ -36,7 +36,6 @@ import org.apache.cxf.fediz.core.Claim;
import org.apache.cxf.fediz.core.ClaimCollection;
import org.apache.cxf.fediz.core.FedizPrincipal;
import org.apache.cxf.fediz.core.SecurityTokenThreadLocal;
-
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.util.Assert;
diff --git a/systests/webapps/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java b/systests/webapps/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
index c846ca3..1153b6a 100644
--- a/systests/webapps/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
+++ b/systests/webapps/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
@@ -36,7 +36,6 @@ import org.apache.cxf.fediz.core.Claim;
import org.apache.cxf.fediz.core.ClaimCollection;
import org.apache.cxf.fediz.core.SecurityTokenThreadLocal;
import org.apache.cxf.fediz.spring.authentication.FederationAuthenticationToken;
-
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.context.SecurityContextHolder;
--
To stop receiving notification emails like this one, please contact
coheigea@apache.org.