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 2012/05/16 13:18:02 UTC
svn commit: r1339115 - in /cxf/fediz/trunk:
examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/
plugins/core/ plugins/core/src/main/java/org/apache/cxf/fediz/core/
plugins/core/src/main/java/org/apache/cxf/fediz/core/config/ plugins/core/...
Author: coheigea
Date: Wed May 16 11:18:01 2012
New Revision: 1339115
URL: http://svn.apache.org/viewvc?rev=1339115&view=rev
Log:
Some Fediz tidy-up
Modified:
cxf/fediz/trunk/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationFilter.java
cxf/fediz/trunk/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
cxf/fediz/trunk/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/SecurityTokenThreadLocal.java
cxf/fediz/trunk/plugins/core/pom.xml
cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/Claim.java
cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/ClaimTypes.java
cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationConstants.java
cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationProcessorImpl.java
cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationRequest.java
cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationResponse.java
cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenReplayCache.java
cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenValidatorResponse.java
cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Authentication.java
cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/CertStore.java
cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Claim.java
cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FederationContext.java
cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/HomeRealm.java
cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/KeyStore.java
cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/PropertyType.java
cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Protocol.java
cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/TrustManager.java
cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/TrustedIssuer.java
cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java
cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationTest.java
cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java
cxf/fediz/trunk/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
cxf/fediz/trunk/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationPrincipalImpl.java
cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
Modified: cxf/fediz/trunk/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationFilter.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationFilter.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationFilter.java (original)
+++ cxf/fediz/trunk/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationFilter.java Wed May 16 11:18:01 2012
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.cxf.fediz.example;
import java.io.IOException;
@@ -13,52 +29,51 @@ import javax.servlet.http.HttpServletReq
import org.w3c.dom.Element;
/**
-* Add security token to thread local
-*/
+ * Add security token to thread local
+ */
public class FederationFilter implements Filter {
- private static final String DEFAULT_SECURITY_TOKEN_ATTR = "org.apache.fediz.SECURITY_TOKEN";
- private static final String SECURITY_TOKEN_ATTR_CONFIG = "security.token.attribute";
-
- private String securityTokenAttr = DEFAULT_SECURITY_TOKEN_ATTR;
-
- @Override
- public void init(FilterConfig filterConfig) throws ServletException {
- String attrName = filterConfig.getInitParameter(SECURITY_TOKEN_ATTR_CONFIG);
- if (attrName != null) {
- securityTokenAttr = attrName;
- }
-
- }
-
- @Override
- public void doFilter(ServletRequest request, ServletResponse response,
- FilterChain chain) throws IOException, ServletException {
-
- if (request instanceof HttpServletRequest) {
- HttpServletRequest hrequest = (HttpServletRequest)request;
- Element el = (Element)hrequest.getSession().getAttribute(securityTokenAttr);
- if (el != null) {
- try
- {
- SecurityTokenThreadLocal.setToken(el);
- chain.doFilter(request, response);
- } finally {
- SecurityTokenThreadLocal.setToken(null);
- }
- } else {
- chain.doFilter(request, response);
- }
-
- } else {
- chain.doFilter(request, response);
- }
- }
-
- @Override
- public void destroy() {
- // TODO Auto-generated method stub
+ private static final String DEFAULT_SECURITY_TOKEN_ATTR = "org.apache.fediz.SECURITY_TOKEN";
+ private static final String SECURITY_TOKEN_ATTR_CONFIG = "security.token.attribute";
- }
+ private String securityTokenAttr = DEFAULT_SECURITY_TOKEN_ATTR;
+
+ @Override
+ public void init(FilterConfig filterConfig) throws ServletException {
+ String attrName = filterConfig.getInitParameter(SECURITY_TOKEN_ATTR_CONFIG);
+ if (attrName != null) {
+ securityTokenAttr = attrName;
+ }
+
+ }
+
+ @Override
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain) throws IOException, ServletException {
+
+ if (request instanceof HttpServletRequest) {
+ HttpServletRequest hrequest = (HttpServletRequest)request;
+ Element el = (Element)hrequest.getSession().getAttribute(securityTokenAttr);
+ if (el != null) {
+ try {
+ SecurityTokenThreadLocal.setToken(el);
+ chain.doFilter(request, response);
+ } finally {
+ SecurityTokenThreadLocal.setToken(null);
+ }
+ } else {
+ chain.doFilter(request, response);
+ }
+
+ } else {
+ chain.doFilter(request, response);
+ }
+ }
+
+ @Override
+ public void destroy() {
+ // TODO Auto-generated method stub
+
+ }
}
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=1339115&r1=1339114&r2=1339115&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 Wed May 16 11:18:01 2012
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.cxf.fediz.example;
import java.io.IOException;
@@ -44,7 +60,6 @@ public class FederationServlet extends H
out.println("Request url: " + request.getRequestURL().toString() + "<p>");
-
out.println("<br><b>User</b><p>");
Principal p = request.getUserPrincipal();
if (p != null) {
@@ -65,8 +80,7 @@ public class FederationServlet extends H
for (Claim c: claims) {
out.println(c.getClaimType().toString() + ": " + c.getValue() + "<p>");
}
- }
- else {
+ } else {
out.println("Principal is not instance of FederationPrincipal");
}
@@ -89,8 +103,7 @@ public class FederationServlet extends H
} catch (Exception ex) {
out.println("<p>Failed to transform cached element to string: " + ex.toString());
}
- }
- else {
+ } else {
out.println("<p>Bootstrap token not cached in thread local storage");
}
Modified: cxf/fediz/trunk/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/SecurityTokenThreadLocal.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/SecurityTokenThreadLocal.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/SecurityTokenThreadLocal.java (original)
+++ cxf/fediz/trunk/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/SecurityTokenThreadLocal.java Wed May 16 11:18:01 2012
@@ -1,22 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.cxf.fediz.example;
import org.w3c.dom.Element;
/**
-* Thread local storage for security token
-*/
+ * Thread local storage for security token
+ */
public class SecurityTokenThreadLocal {
- private static final ThreadLocal<Element> threadToken =
- new ThreadLocal<Element>() {
- };
-
- public static void setToken(Element token) {
- threadToken.set(token);
- }
-
- public static Element getToken() {
- return threadToken.get();
- }
+ private static final ThreadLocal<Element> threadToken =
+ new ThreadLocal<Element>() {
+ };
+
+ public static void setToken(Element token) {
+ threadToken.set(token);
+ }
+
+ public static Element getToken() {
+ return threadToken.get();
+ }
}
\ No newline at end of file
Modified: cxf/fediz/trunk/plugins/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/pom.xml?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/pom.xml (original)
+++ cxf/fediz/trunk/plugins/core/pom.xml Wed May 16 11:18:01 2012
@@ -38,7 +38,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.2</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -50,13 +50,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>1.6.1</version>
+ <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/Claim.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/Claim.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/Claim.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/Claim.java Wed May 16 11:18:01 2012
@@ -44,7 +44,6 @@ import java.security.Principal;
*/
public class Claim implements Serializable {
-
/**
*
*/
Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/ClaimTypes.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/ClaimTypes.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/ClaimTypes.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/ClaimTypes.java Wed May 16 11:18:01 2012
@@ -29,7 +29,7 @@ public interface ClaimTypes {
* The base XML namespace URI that is used by the claim types
* http://docs.oasis-open.org/imi/identity/v1.0/os/identity-1.0-spec-os.pdf
*/
- public static final URI URI_BASE =
+ URI URI_BASE =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims");
/**
@@ -37,14 +37,14 @@ public interface ClaimTypes {
* According to RFC 2256: This attribute is used to hold the part of a person's name
* which is not their surname nor middle name.
*/
- public static final URI FIRSTNAME =
+ URI FIRSTNAME =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname");
/**
* (sn in [RFC 2256]) Surname or family name of a Subject.
* According to RFC 2256: This is the X.500 surname attribute which contains the family name of a person.
*/
- public static final URI LASTNAME =
+ URI LASTNAME =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname");
/**
@@ -53,7 +53,7 @@ public interface ClaimTypes {
* According to inetOrgPerson using [RFC 1274]: This attribute type specifies
* an electronic mailbox attribute following the syntax specified in RFC 822.
*/
- public static final URI EMAILADDRESS =
+ URI EMAILADDRESS =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress");
/**
@@ -61,14 +61,14 @@ public interface ClaimTypes {
* According to RFC 2256: This attribute contains the physical address of the object
* to which the entry corresponds, such as an address for package delivery.
*/
- public static final URI STREETADDRESS =
+ URI STREETADDRESS =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/streetaddress");
/**
* (/ in [RFC 2256]) Locality component of a Subject's address information.
* According to RFC 2256: This attribute contains the name of a locality, such as a city, county or other geographic region.
*/
- public static final URI LOCALITY =
+ URI LOCALITY =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/locality");
/**
@@ -76,66 +76,66 @@ public interface ClaimTypes {
* According to RFC 2256: âThis attribute contains the full name of a state or province.
* The values SHOULD be coordinated on a national level and if well-known shortcuts exist.
*/
- public static final URI STATE_PROVINCE =
+ URI STATE_PROVINCE =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/stateorprovince");
/**
* (postalCode in X.500) Postal code or zip code component of a Subject's address information.
* According to X.500(2001): The postal code attribute type specifies the postal code of the named object.
*/
- public static final URI POSTALCODE =
+ URI POSTALCODE =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/postalcode");
/**
* (c in [RFC 2256]) Country of a Subject.
* According to RFC 2256: This attribute contains a two-letter ISO 3166 country code.
*/
- public static final URI COUNTRY =
+ URI COUNTRY =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/country");
/**
* (homePhone in inetOrgPerson) Primary or home telephone number of a Subject.
* According to inetOrgPerson using [RFC 1274]: This attribute type specifies a home telephone number associated with a person.
*/
- public static final URI HOMEPHONE =
+ URI HOMEPHONE =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/homephone");
/**
* (telephoneNumber in X.500 Person) Secondary or work telephone number of a Subject.
* According to X.500(2001): This attribute type specifies an office/campus telephone number associated with a person.
*/
- public static final URI OTHERPHONE =
+ URI OTHERPHONE =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/otherphone");
/**
* (mobile in inetOrgPerson) Mobile telephone number of a Subject.
* According to inetOrgPerson using [RFC 1274]: This attribute type specifies a mobile telephone number associated with a person.
*/
- public static final URI MOBILEPHONE =
+ URI MOBILEPHONE =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/mobilephone");
/**
* The date of birth of a Subject in a form allowed by the xs:date data type.
*/
- public static final URI DATEOFBIRTH =
+ URI DATEOFBIRTH =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/dateofbirth");
/**
* Gender of a Subject that can have any of these exact URI values
* '0' (meaning unspecified), '1' (meaning Male) or '2' (meaning Female)
*/
- public static final URI GENDER =
+ URI GENDER =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/gender");
/**
* A private personal identifier (PPID) that identifies the Subject to a Relying Party.
*/
- public static final URI PRIVATE_PERSONAL_IDENTIFIER =
+ URI PRIVATE_PERSONAL_IDENTIFIER =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier");
/**
* The Web page of a Subject expressed as a URL.
*/
- public static final URI WEB_PAGE =
+ URI WEB_PAGE =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/webpage");
}
Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationConstants.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationConstants.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationConstants.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationConstants.java Wed May 16 11:18:01 2012
@@ -22,7 +22,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-public class FederationConstants {
+public final class FederationConstants {
public static final String WSFED_METHOD = "WSFED";
Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationProcessorImpl.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationProcessorImpl.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationProcessorImpl.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationProcessorImpl.java Wed May 16 11:18:01 2012
@@ -43,17 +43,15 @@ import org.xml.sax.SAXException;
public class FederationProcessorImpl implements FederationProcessor {
- private static final Logger LOG = LoggerFactory
- .getLogger(FederationProcessorImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FederationProcessorImpl.class);
private String namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512";
- private TokenReplayCache<String> replayCache = null;
+ private TokenReplayCache<String> replayCache;
/**
* Default constructor
*/
-
public FederationProcessorImpl() {
super();
replayCache = TokenReplayCacheInMemory.getInstance();
@@ -65,7 +63,6 @@ public class FederationProcessorImpl imp
* plugable token cache allowing to provide a replicated cache to
* be used in clustered scenarios
*/
-
public FederationProcessorImpl(TokenReplayCache<String> replayCache) {
super();
this.replayCache = replayCache;
Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationRequest.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationRequest.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationRequest.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationRequest.java Wed May 16 11:18:01 2012
@@ -19,9 +19,9 @@ package org.apache.cxf.fediz.core;
public class FederationRequest {
- private String wa = null;
- private String wresult = null;
- private String wct = null;
+ private String wa;
+ private String wresult;
+ private String wct;
public String getWct() {
Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationResponse.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationResponse.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationResponse.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationResponse.java Wed May 16 11:18:01 2012
@@ -25,27 +25,25 @@ import org.w3c.dom.Element;
public class FederationResponse {
- private String audience = null;
- private String username = null;
- private List<String> roles = null;
- private String issuer = null;
- private List<Claim> claims = null;
- private Element token = null;
- private String uniqueTokenId = null;
+ private String audience;
+ private String username;
+ private List<String> roles;
+ private String issuer;
+ private List<Claim> claims;
+ private Element token;
+ private String uniqueTokenId;
/**
* Created time
*/
- private Date tokenCreated = null;
+ private Date tokenCreated;
- /** * Expiration time
+ /**
+ * Expiration time
*/
- private Date tokenExpires = null;
+ private Date tokenExpires;
-
- private FederationResponse() {}
-
public FederationResponse(String username, String issuer, List<String> roles, List<Claim> claims, String audience, Date created, Date expires, Element token, String uniqueTokenId) {
this.username = username;
this.issuer = issuer;
@@ -58,8 +56,6 @@ public class FederationResponse {
this.uniqueTokenId = uniqueTokenId;
}
-
-
public String getUniqueTokenId() {
return uniqueTokenId;
}
@@ -68,40 +64,32 @@ public class FederationResponse {
return audience;
}
-
-
public String getUsername() {
return username;
}
-
-
public List<String> getRoles() {
- if (roles == null) return null;
- else return Collections.unmodifiableList(roles);
+ if (roles == null) {
+ return null;
+ }
+ return Collections.unmodifiableList(roles);
}
-
-
public String getIssuer() {
return issuer;
}
-
-
public List<Claim> getClaims() {
- if (claims == null) return null;
- else return Collections.unmodifiableList(claims);
+ if (claims == null) {
+ return null;
+ }
+ return Collections.unmodifiableList(claims);
}
-
-
public Date getTokenCreated() {
return tokenCreated;
}
-
-
public Date getTokenExpires() {
return tokenExpires;
}
@@ -111,5 +99,4 @@ public class FederationResponse {
}
-
}
Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenReplayCache.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenReplayCache.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenReplayCache.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenReplayCache.java Wed May 16 11:18:01 2012
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.cxf.fediz.core;
public interface TokenReplayCache<T> {
Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenValidatorResponse.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenValidatorResponse.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenValidatorResponse.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenValidatorResponse.java Wed May 16 11:18:01 2012
@@ -21,12 +21,12 @@ import java.util.List;
public class TokenValidatorResponse {
- private String username = null;
- private String uniqueTokenId = null;
- private List<String> roles = null;
- private String issuer = null;
- private String audience = null;
- private List<Claim> claims = null;
+ private String username;
+ private String uniqueTokenId;
+ private List<String> roles;
+ private String issuer;
+ private String audience;
+ private List<Claim> claims;
Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Authentication.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Authentication.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Authentication.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Authentication.java Wed May 16 11:18:01 2012
@@ -21,7 +21,7 @@ import org.apache.cxf.fediz.core.config.
import org.apache.cxf.fediz.core.config.jaxb.AuthenticationType;
public class Authentication {
- private AuthenticationType authType = null;
+ private AuthenticationType authType;
public Authentication(AuthenticationType authType) {
super();
Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/CertStore.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/CertStore.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/CertStore.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/CertStore.java Wed May 16 11:18:01 2012
@@ -20,7 +20,7 @@ package org.apache.cxf.fediz.core.config
import org.apache.cxf.fediz.core.config.jaxb.CertStoreType;
public class CertStore {
- private CertStoreType certStoreType = null;
+ private CertStoreType certStoreType;
public CertStore(CertStoreType certStoreType) {
super();
Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Claim.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Claim.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Claim.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Claim.java Wed May 16 11:18:01 2012
@@ -21,7 +21,7 @@ import org.apache.cxf.fediz.core.config.
public class Claim {
- private ClaimType claimType = null;
+ private ClaimType claimType;
public Claim(ClaimType claimType) {
super();
Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FederationContext.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FederationContext.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FederationContext.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FederationContext.java Wed May 16 11:18:01 2012
@@ -34,7 +34,7 @@ import org.apache.cxf.fediz.core.excepti
public class FederationContext {
- private ContextConfig config = null;
+ private ContextConfig config;
private boolean detectExpiredTokens = true;
private boolean detectReplayedTokens = true;
Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/HomeRealm.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/HomeRealm.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/HomeRealm.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/HomeRealm.java Wed May 16 11:18:01 2012
@@ -3,7 +3,7 @@ package org.apache.cxf.fediz.core.config
import org.apache.cxf.fediz.core.config.jaxb.ArgumentType;
public class HomeRealm {
- private org.apache.cxf.fediz.core.config.jaxb.HomeRealm homeRealm = null;
+ private org.apache.cxf.fediz.core.config.jaxb.HomeRealm homeRealm;
public HomeRealm(org.apache.cxf.fediz.core.config.jaxb.HomeRealm homeRealm) {
super();
Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/KeyStore.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/KeyStore.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/KeyStore.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/KeyStore.java Wed May 16 11:18:01 2012
@@ -20,79 +20,79 @@ package org.apache.cxf.fediz.core.config
import org.apache.cxf.fediz.core.config.jaxb.KeyStoreType;
public class KeyStore {
- private KeyStoreType kesyStoreType = null;
+ private KeyStoreType keyStoreType;
- public KeyStore(KeyStoreType kesyStoreType) {
+ public KeyStore(KeyStoreType keyStoreType) {
super();
- this.kesyStoreType = kesyStoreType;
+ this.keyStoreType = keyStoreType;
}
- protected KeyStoreType getKesyStoreType() {
- return kesyStoreType;
+ protected KeyStoreType getkeyStoreType() {
+ return keyStoreType;
}
- protected void setKesyStoreType(KeyStoreType kesyStoreType) {
- this.kesyStoreType = kesyStoreType;
+ protected void setkeyStoreType(KeyStoreType keyStoreType) {
+ this.keyStoreType = keyStoreType;
}
public String getType() {
- return kesyStoreType.getType();
+ return keyStoreType.getType();
}
public void setType(String value) {
- kesyStoreType.setType(value);
+ keyStoreType.setType(value);
}
public String getPassword() {
- return kesyStoreType.getPassword();
+ return keyStoreType.getPassword();
}
public void setPassword(String value) {
- kesyStoreType.setPassword(value);
+ keyStoreType.setPassword(value);
}
public String getProvider() {
- return kesyStoreType.getProvider();
+ return keyStoreType.getProvider();
}
public void setProvider(String value) {
- kesyStoreType.setProvider(value);
+ keyStoreType.setProvider(value);
}
public String getUrl() {
- return kesyStoreType.getUrl();
+ return keyStoreType.getUrl();
}
public void setUrl(String value) {
- kesyStoreType.setUrl(value);
+ keyStoreType.setUrl(value);
}
public String getFile() {
- return kesyStoreType.getFile();
+ return keyStoreType.getFile();
}
public void setFile(String value) {
- kesyStoreType.setFile(value);
+ keyStoreType.setFile(value);
}
public String getResource() {
- return kesyStoreType.getResource();
+ return keyStoreType.getResource();
}
public void setResource(String value) {
- kesyStoreType.setResource(value);
+ keyStoreType.setResource(value);
}
public int hashCode() {
- return kesyStoreType.hashCode();
+ return keyStoreType.hashCode();
}
public boolean equals(Object obj) {
- return kesyStoreType.equals(obj);
+ return keyStoreType.equals(obj);
}
public String toString() {
- return kesyStoreType.toString();
+ return keyStoreType.toString();
}
}
Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/PropertyType.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/PropertyType.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/PropertyType.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/PropertyType.java Wed May 16 11:18:01 2012
@@ -25,12 +25,9 @@ public enum PropertyType {
STRING("String");
private final String value;
-
-
PropertyType(String v) {
value = v;
}
-
PropertyType(ArgumentType arg) {
value = arg.value();
Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Protocol.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Protocol.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Protocol.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Protocol.java Wed May 16 11:18:01 2012
@@ -20,7 +20,7 @@ package org.apache.cxf.fediz.core.config
import org.apache.cxf.fediz.core.config.jaxb.ProtocolType;
public abstract class Protocol {
- private ProtocolType protocolType = null;
+ private ProtocolType protocolType;
public Protocol(ProtocolType protocolType) {
super();
Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/TrustManager.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/TrustManager.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/TrustManager.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/TrustManager.java Wed May 16 11:18:01 2012
@@ -20,26 +20,21 @@ package org.apache.cxf.fediz.core.config
import org.apache.cxf.fediz.core.config.jaxb.TrustManagersType;
public class TrustManager {
- private TrustManagersType trustManagerType = null;
+ private TrustManagersType trustManagerType;
-
public TrustManager(TrustManagersType trustManagerType) {
super();
this.trustManagerType = trustManagerType;
}
-
-
public KeyStore getKeyStore() {
return new KeyStore(trustManagerType.getKeyStore());
}
public void setKeyStore(KeyStore keyStore) {
- trustManagerType.setKeyStore(keyStore.getKesyStoreType());
+ trustManagerType.setKeyStore(keyStore.getkeyStoreType());
}
-
-
public String getProvider() {
return trustManagerType.getProvider();
}
@@ -48,7 +43,7 @@ public class TrustManager {
trustManagerType.setProvider(value);
}
- public int hashCode() {
+ public int hashCode() {
return trustManagerType.hashCode();
}
Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/TrustedIssuer.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/TrustedIssuer.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/TrustedIssuer.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/TrustedIssuer.java Wed May 16 11:18:01 2012
@@ -21,7 +21,7 @@ import org.apache.cxf.fediz.core.config.
import org.apache.cxf.fediz.core.config.jaxb.ValidationType;
public class TrustedIssuer {
- private TrustedIssuerType trustedIssuerType = null;
+ private TrustedIssuerType trustedIssuerType;
public TrustedIssuer(TrustedIssuerType trustedIssuerType) {
@@ -65,9 +65,8 @@ public class TrustedIssuer {
}
}
-
- public int hashCode() {
+ public int hashCode() {
return trustedIssuerType.hashCode();
}
Modified: cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java (original)
+++ cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java Wed May 16 11:18:01 2012
@@ -373,9 +373,6 @@ public class SAMLTokenValidator implemen
class PasswordCallbackHandler implements CallbackHandler {
private String password;
- private PasswordCallbackHandler() {
- }
-
public PasswordCallbackHandler(String password) {
this.password = password;
}
Modified: cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationTest.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationTest.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationTest.java (original)
+++ cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationTest.java Wed May 16 11:18:01 2012
@@ -60,7 +60,7 @@ public class FedizConfigurationTest {
private static final String SUBJECT_VALUE_3 = ".*CN=www.sts3.com.*";
- private static final String CONFIG_FILE = "./fedizconfig.xml";
+ private static final String CONFIG_FILE = "./target/fedizconfig.xml";
private FedizConfig createConfiguration() throws JAXBException {
Modified: cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java (original)
+++ cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/config/FedizConfigurationWriterTest.java Wed May 16 11:18:01 2012
@@ -21,7 +21,6 @@ import org.apache.cxf.fediz.core.config.
import org.apache.cxf.fediz.core.config.jaxb.FedizConfig;
import org.apache.cxf.fediz.core.config.jaxb.HomeRealm;
import org.apache.cxf.fediz.core.config.jaxb.KeyStoreType;
-import org.apache.cxf.fediz.core.config.jaxb.ProtocolType;
import org.apache.cxf.fediz.core.config.jaxb.TrustManagersType;
import org.apache.cxf.fediz.core.config.jaxb.TrustedIssuerType;
import org.apache.cxf.fediz.core.config.jaxb.TrustedIssuers;
@@ -55,7 +54,7 @@ public class FedizConfigurationWriterTes
private static final String CLAIM_TYPE_1 = "a particular claim type";
- private static final String CONFIG_FILE = "./fediz_test_config.xml";
+ private static final String CONFIG_FILE = "./target/fediz_test_config.xml";
private FedizConfig createConfiguration() throws JAXBException {
Modified: cxf/fediz/trunk/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java (original)
+++ cxf/fediz/trunk/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java Wed May 16 11:18:01 2012
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.cxf.fediz.tomcat;
import java.io.File;
Modified: cxf/fediz/trunk/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationPrincipalImpl.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationPrincipalImpl.java?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationPrincipalImpl.java (original)
+++ cxf/fediz/trunk/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationPrincipalImpl.java Wed May 16 11:18:01 2012
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.cxf.fediz.tomcat;
import java.util.List;
Modified: cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml?rev=1339115&r1=1339114&r2=1339115&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml (original)
+++ cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml Wed May 16 11:18:01 2012
@@ -77,14 +77,9 @@
<ref bean="claimsAttributeProvider" />
</util:list>
- <bean id="defaultAttributeProvider"
- class="org.apache.cxf.sts.token.provider.DefaultAttributeStatementProvider" />
-
-
<bean id="claimsAttributeProvider"
class="org.apache.cxf.sts.claims.ClaimsAttributeStatementProvider" />
-
<import resource="userClaims.xml" />
<bean id="claimsManager" class="org.apache.cxf.sts.claims.ClaimsManager">