svn commit: r1137681 - /cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProvider.java

[coheigea]

Author: coheigea
Date: Mon Jun 20 16:18:56 2011
New Revision: 1137681

URL: http://svn.apache.org/viewvc?rev=1137681&view=rev
Log:
[CXF-3606] - CXF STS Provider framework only works with Issue Operation

Modified:
    
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProvider.java

Modified: 
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProvider.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProvider.java?rev=1137681&r1=1137680&r2=1137681&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProvider.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProvider.java
 Mon Jun 20 16:18:56 2011
@@ -86,33 +86,32 @@ public class SecurityTokenServiceProvide
                                                               
WebServiceContext.class);
             OPERATION_METHODS.put(WSTRUST_REQUESTTYPE_ISSUE, m);
             
-            m = IssueOperation.class.getDeclaredMethod("cancel", 
+            m = CancelOperation.class.getDeclaredMethod("cancel", 
                                                        
RequestSecurityTokenType.class, 
                                                        
WebServiceContext.class);
             OPERATION_METHODS.put(WSTRUST_REQUESTTYPE_CANCEL, m);
             
-            m = IssueOperation.class.getDeclaredMethod("renew", 
+            m = RenewOperation.class.getDeclaredMethod("renew", 
                                                        
RequestSecurityTokenType.class, 
                                                        
WebServiceContext.class);
             OPERATION_METHODS.put(WSTRUST_REQUESTTYPE_RENEW, m);
             
-            m = IssueOperation.class.getDeclaredMethod("validate", 
+            m = ValidateOperation.class.getDeclaredMethod("validate", 
                                                        
RequestSecurityTokenType.class, 
                                                        
WebServiceContext.class);
             OPERATION_METHODS.put(WSTRUST_REQUESTTYPE_VALIDATE, m);
             
-            m = IssueOperation.class.getDeclaredMethod("keyExchangeToken", 
+            m = 
KeyExchangeTokenOperation.class.getDeclaredMethod("keyExchangeToken", 
                                                        
RequestSecurityTokenType.class, 
                                                        
WebServiceContext.class);
             OPERATION_METHODS.put(WSTRUST_REQUESTTYPE_KEYEXCHANGETOKEN, m);
             
-            m = IssueOperation.class.getDeclaredMethod("requestCollection", 
+            m = 
RequestCollectionOperation.class.getDeclaredMethod("requestCollection", 
                                                        
RequestSecurityTokenCollectionType.class, 
                                                        
WebServiceContext.class);
             OPERATION_METHODS.put(WSTRUST_REQUESTTYPE_REQUESTCOLLECTION, m);
         } catch (Exception ex) {
-            //Should not happen as nothing will work.  All operations will
-            //end up throwing UnsupportedOpertation
+            ex.printStackTrace();
         }
     }