cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From owu...@apache.org
Subject svn commit: r1232553 - in /cxf/trunk/services/sts: sts-core/src/main/java/org/apache/cxf/sts/claims/ sts-core/src/test/java/org/apache/cxf/sts/common/ systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/
Date Tue, 17 Jan 2012 19:52:01 GMT
Author: owulff
Date: Tue Jan 17 19:52:00 2012
New Revision: 1232553

URL: http://svn.apache.org/viewvc?rev=1232553&view=rev
Log:
Remove deprecated method in ClaimsHandler

Modified:
    cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsHandler.java
    cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
    cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java
    cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimsHandler.java
    cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java

Modified: cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsHandler.java?rev=1232553&r1=1232552&r2=1232553&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsHandler.java
(original)
+++ cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsHandler.java
Tue Jan 17 19:52:00 2012
@@ -20,11 +20,8 @@
 package org.apache.cxf.sts.claims;
 
 import java.net.URI;
-import java.security.Principal;
 import java.util.List;
 
-import javax.xml.ws.WebServiceContext;
-
 /**
  * This interface provides a pluggable way to handle Claims.
  */
@@ -32,10 +29,6 @@ public interface ClaimsHandler {
 
     List<URI> getSupportedClaimTypes();
 
-    @Deprecated
-    ClaimCollection retrieveClaimValues(
-            Principal principal, RequestClaimCollection claims, WebServiceContext context,
String realm);
-
     ClaimCollection retrieveClaimValues(RequestClaimCollection claims, ClaimsParameters parameters);
 
 }

Modified: cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java?rev=1232553&r1=1232552&r2=1232553&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
(original)
+++ cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java
Tue Jan 17 19:52:00 2012
@@ -20,13 +20,10 @@
 package org.apache.cxf.sts.claims;
 
 import java.net.URI;
-import java.security.Principal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
 
-import javax.xml.ws.WebServiceContext;
-
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.ws.security.sts.provider.STSException;
 
@@ -58,24 +55,6 @@ public class ClaimsManager {
             }
         }
     }
-
-    @Deprecated
-    public ClaimCollection retrieveClaimValues(
-            Principal principal, RequestClaimCollection claims, WebServiceContext context,
String realm) {
-        if (claimHandlers != null && claimHandlers.size() > 0 && claims
!= null && claims.size() > 0) {
-            ClaimCollection returnCollection = new ClaimCollection();
-            for (ClaimsHandler handler : claimHandlers) {
-                ClaimCollection claimCollection = handler.retrieveClaimValues(
-                        principal, claims, context, realm);
-                if (claimCollection != null && claimCollection.size() != 0) {
-                    returnCollection.addAll(claimCollection);
-                }
-            }
-            validateClaimValues(claims, returnCollection);
-            return returnCollection;
-        }
-        return null;
-    }
     
     public ClaimCollection retrieveClaimValues(RequestClaimCollection claims, ClaimsParameters
parameters) {
         if (claimHandlers != null && claimHandlers.size() > 0 && claims
!= null && claims.size() > 0) {

Modified: cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java?rev=1232553&r1=1232552&r2=1232553&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java
(original)
+++ cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/LdapClaimsHandler.java
Tue Jan 17 19:52:00 2012
@@ -37,7 +37,6 @@ import javax.naming.directory.Attributes
 import javax.naming.directory.SearchControls;
 import javax.security.auth.kerberos.KerberosPrincipal;
 import javax.security.auth.x500.X500Principal;
-import javax.xml.ws.WebServiceContext;
 
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.helpers.CastUtils;
@@ -127,20 +126,7 @@ public class LdapClaimsHandler implement
         }
 
         return uriList;
-    }
-
-    @Deprecated
-    public ClaimCollection retrieveClaimValues(
-            Principal principal, RequestClaimCollection claims, WebServiceContext context,
String realm) {
-        
-        ClaimsParameters params = new ClaimsParameters();
-        params.setPrincipal(principal);
-        params.setWebServiceContext(context);
-        params.setRealm(realm);
-        
-        return retrieveClaimValues(claims, params);
-    }
-    
+    }    
     
     public ClaimCollection retrieveClaimValues(
             RequestClaimCollection claims, ClaimsParameters parameters) {

Modified: cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimsHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimsHandler.java?rev=1232553&r1=1232552&r2=1232553&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimsHandler.java
(original)
+++ cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimsHandler.java
Tue Jan 17 19:52:00 2012
@@ -19,12 +19,9 @@
 package org.apache.cxf.sts.common;
 
 import java.net.URI;
-import java.security.Principal;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.ws.WebServiceContext;
-
 import org.apache.cxf.sts.claims.Claim;
 import org.apache.cxf.sts.claims.ClaimCollection;
 import org.apache.cxf.sts.claims.ClaimTypes;
@@ -48,20 +45,7 @@ public class CustomClaimsHandler impleme
 
     public List<URI> getSupportedClaimTypes() {
         return knownURIs;
-    }
-
-    @Deprecated
-    public ClaimCollection retrieveClaimValues(
-            Principal principal, RequestClaimCollection claims, WebServiceContext context,
String realm) {
-        
-        ClaimsParameters params = new ClaimsParameters();
-        params.setPrincipal(principal);
-        params.setWebServiceContext(context);
-        params.setRealm(realm);
-        
-        return retrieveClaimValues(claims, params);
-    }
-    
+    }    
     
     public ClaimCollection retrieveClaimValues(
             RequestClaimCollection claims, ClaimsParameters parameters) {

Modified: cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java?rev=1232553&r1=1232552&r2=1232553&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java
(original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomClaimsHandler.java
Tue Jan 17 19:52:00 2012
@@ -19,12 +19,9 @@
 package org.apache.cxf.systest.sts.deployment;
 
 import java.net.URI;
-import java.security.Principal;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.ws.WebServiceContext;
-
 import org.apache.cxf.sts.claims.Claim;
 import org.apache.cxf.sts.claims.ClaimCollection;
 import org.apache.cxf.sts.claims.ClaimsHandler;
@@ -38,20 +35,7 @@ import org.apache.cxf.sts.claims.Request
 public class CustomClaimsHandler implements ClaimsHandler {
 
     public static final URI ROLE = 
-            URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role");
-
-    @Deprecated
-    public ClaimCollection retrieveClaimValues(
-            Principal principal, RequestClaimCollection claims, WebServiceContext context,
String realm) {
-        
-        ClaimsParameters params = new ClaimsParameters();
-        params.setPrincipal(principal);
-        params.setWebServiceContext(context);
-        params.setRealm(realm);
-        
-        return retrieveClaimValues(claims, params);
-    }
-    
+            URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role");  
     
     public ClaimCollection retrieveClaimValues(
             RequestClaimCollection claims, ClaimsParameters parameters) {



Mime
View raw message