svn commit: r1459861 - in /cxf/branches/wss4j2.0-port: rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/ rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/ services/sts/sts-core/src/main/java/org/apache/cxf/sts/to...

[coheigea]

Author: coheigea
Date: Fri Mar 22 16:00:10 2013
New Revision: 1459861

URL: http://svn.apache.org/r1459861
Log:
and some more fixes


Conflicts:
        
rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
        
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java

Modified:
    
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
    
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
    
cxf/branches/wss4j2.0-port/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java

Modified: 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java?rev=1459861&r1=1459860&r2=1459861&view=diff
==============================================================================
--- 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
 (original)
+++ 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
 Fri Mar 22 16:00:10 2013
@@ -523,10 +523,8 @@ public class IssuedTokenInterceptorProvi
             Message message,
             AssertionInfoMap aim
         ) {
-            List<WSSecurityEngineResult> signedResults = new 
ArrayList<WSSecurityEngineResult>();
-            WSSecurityUtil.fetchAllActionResults(
-                rResult.getResults(), WSConstants.SIGN, signedResults
-            );
+            List<WSSecurityEngineResult> signedResults = 
+                WSSecurityUtil.fetchAllActionResults(rResult.getResults(), 
WSConstants.SIGN);
             
             IssuedTokenPolicyValidator issuedValidator = 
                 new IssuedTokenPolicyValidator(signedResults, message);

Modified: 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java?rev=1459861&r1=1459860&r2=1459861&view=diff
==============================================================================
--- 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
 (original)
+++ 
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java
 Fri Mar 22 16:00:10 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;
@@ -127,15 +126,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);
+                WSSecurityUtil.fetchAllActionResults(wshr.getResults(), 
WSConstants.SIGN);
             
-            WSSecurityUtil.fetchAllActionResults(wshr.getResults(),
-                    WSConstants.ENCR, wsSecurityEngineEncResults);
+            final List<WSSecurityEngineResult> wsSecurityEngineEncResults = 
+                WSSecurityUtil.fetchAllActionResults(wshr.getResults(), 
WSConstants.ENCR);
             
             for (WSSecurityEngineResult wser : wsSecurityEngineSignResults) {
             

Modified: 
cxf/branches/wss4j2.0-port/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java?rev=1459861&r1=1459860&r2=1459861&view=diff
==============================================================================
--- 
cxf/branches/wss4j2.0-port/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
 (original)
+++ 
cxf/branches/wss4j2.0-port/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
 Fri Mar 22 16:00:10 2013
@@ -608,9 +608,11 @@ public class SAMLTokenRenewer implements
             if (handlerResults != null && handlerResults.size() > 0) {
                 WSHandlerResult handlerResult = handlerResults.get(0);
                 List<WSSecurityEngineResult> results = 
handlerResult.getResults();
+                final List<Integer> signedActions = new ArrayList<Integer>(2);
+                signedActions.add(WSConstants.SIGN);
+                signedActions.add(WSConstants.UT_SIGN);
                 
-                WSSecurityUtil.fetchAllActionResults(results, 
WSConstants.SIGN, signedResults);
-                WSSecurityUtil.fetchAllActionResults(results, 
WSConstants.UT_SIGN, signedResults);
+                
signedResult.addAll(WSSecurityUtil.fetchAllActionResults(results, 
signedActions));
             }
             
             TLSSessionInfo tlsInfo = 
(TLSSessionInfo)messageContext.get(TLSSessionInfo.class.getName());