svn commit: r1459869 - in /cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security: policy/interceptors/IssuedTokenInterceptorProvider.java wss4j/CryptoCoverageChecker.java

[coheigea]

Author: coheigea
Date: Fri Mar 22 16:03:30 2013
New Revision: 1459869

URL: http://svn.apache.org/r1459869
Log:
Merged revisions 1459850 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1459850 | coheigea | 2013-03-22 15:46:18 +0000 (Fri, 22 Mar 2013) | 2 lines

  and some more fixes

........

Modified:
    
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
    
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java

Modified: 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java?rev=1459869&r1=1459868&r2=1459869&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
 Fri Mar 22 16:03:30 2013
@@ -55,6 +55,7 @@ import org.apache.cxf.ws.security.trust.
 import org.apache.cxf.ws.security.wss4j.PolicyBasedWSS4JInInterceptor;
 import org.apache.cxf.ws.security.wss4j.PolicyBasedWSS4JOutInterceptor;
 import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
+import org.apache.cxf.ws.security.wss4j.WSS4JUtils;
 import 
org.apache.cxf.ws.security.wss4j.policyvalidators.IssuedTokenPolicyValidator;
 import org.apache.ws.security.WSConstants;
 import org.apache.ws.security.WSSecurityEngineResult;
@@ -63,7 +64,6 @@ import org.apache.ws.security.handler.WS
 import org.apache.ws.security.message.token.BinarySecurity;
 import org.apache.ws.security.saml.SAMLKeyInfo;
 import org.apache.ws.security.saml.ext.AssertionWrapper;
-import org.apache.ws.security.util.WSSecurityUtil;
 
 /**
  * 
@@ -518,10 +518,8 @@ public class IssuedTokenInterceptorProvi
             Message message,
             AssertionInfoMap aim
         ) {
-            List<WSSecurityEngineResult> signedResults = new 
ArrayList<WSSecurityEngineResult>();
-            WSSecurityUtil.fetchAllActionResults(
-                rResult.getResults(), WSConstants.SIGN, signedResults
-            );
+            List<WSSecurityEngineResult> signedResults = 
+                WSS4JUtils.fetchAllActionResults(rResult.getResults(), 
WSConstants.SIGN);
             
             IssuedTokenPolicyValidator issuedValidator = 
                 new IssuedTokenPolicyValidator(signedResults, message);

Modified: 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java?rev=1459869&r1=1459868&r2=1459869&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
 Fri Mar 22 16:03:30 2013
@@ -26,7 +26,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Vector;
 
 import javax.xml.namespace.QName;
 import javax.xml.soap.SOAPException;
@@ -51,7 +50,6 @@ import org.apache.ws.security.WSSecurity
 import org.apache.ws.security.WSSecurityException;
 import org.apache.ws.security.handler.WSHandlerConstants;
 import org.apache.ws.security.handler.WSHandlerResult;
-import org.apache.ws.security.util.WSSecurityUtil;
 
 /**
  * Utility to enable the checking of WS-Security signature/encryption
@@ -127,15 +125,10 @@ public class CryptoCoverageChecker exten
         
         for (final WSHandlerResult wshr : results) {
             final List<WSSecurityEngineResult> wsSecurityEngineSignResults = 
-                new Vector<WSSecurityEngineResult>();
-            final List<WSSecurityEngineResult> wsSecurityEngineEncResults = 
-                new Vector<WSSecurityEngineResult>();
-            
-            WSSecurityUtil.fetchAllActionResults(wshr.getResults(),
-                    WSConstants.SIGN, wsSecurityEngineSignResults);
+                WSS4JUtils.fetchAllActionResults(wshr.getResults(), 
WSConstants.SIGN);
             
-            WSSecurityUtil.fetchAllActionResults(wshr.getResults(),
-                    WSConstants.ENCR, wsSecurityEngineEncResults);
+            final List<WSSecurityEngineResult> wsSecurityEngineEncResults = 
+                WSS4JUtils.fetchAllActionResults(wshr.getResults(), 
WSConstants.ENCR);
             
             for (WSSecurityEngineResult wser : wsSecurityEngineSignResults) {