Author: coheigea
Date: Fri Mar 22 15:25:03 2013
New Revision: 1459843
URL: http://svn.apache.org/r1459843
Log:
Merging some other work based around Collections
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SAMLUtils.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SAMLUtils.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SAMLUtils.java?rev=1459843&r1=1459842&r2=1459843&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SAMLUtils.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/SAMLUtils.java
Fri Mar 22 15:25:03 2013
@@ -43,7 +43,6 @@ import org.apache.ws.security.WSSecurity
import org.apache.ws.security.saml.SAMLKeyInfo;
import org.apache.ws.security.saml.ext.AssertionWrapper;
import org.apache.ws.security.saml.ext.OpenSAMLUtil;
-import org.apache.ws.security.util.WSSecurityUtil;
import org.opensaml.common.SAMLVersion;
import org.opensaml.xml.XMLObject;
@@ -154,17 +153,21 @@ public final class SAMLUtils {
Message message,
Element body
) throws WSSecurityException {
- List<WSSecurityEngineResult> samlResults = new
ArrayList<WSSecurityEngineResult>();
- WSSecurityUtil.fetchAllActionResults(results, WSConstants.ST_SIGNED,
samlResults);
- WSSecurityUtil.fetchAllActionResults(results, WSConstants.ST_UNSIGNED,
samlResults);
+ final List<Integer> samlActions = new ArrayList<Integer>(2);
+ samlActions.add(WSConstants.ST_SIGNED);
+ samlActions.add(WSConstants.ST_UNSIGNED);
+ List<WSSecurityEngineResult> samlResults =
+ WSS4JUtils.fetchAllActionResults(results, samlActions);
if (samlResults.isEmpty()) {
return;
}
- List<WSSecurityEngineResult> signedResults = new
ArrayList<WSSecurityEngineResult>();
- WSSecurityUtil.fetchAllActionResults(results, WSConstants.SIGN,
signedResults);
- WSSecurityUtil.fetchAllActionResults(results, WSConstants.UT_SIGN,
signedResults);
+ final List<Integer> signedActions = new ArrayList<Integer>(2);
+ signedActions.add(WSConstants.SIGN);
+ signedActions.add(WSConstants.UT_SIGN);
+ List<WSSecurityEngineResult> signedResults =
+ WSS4JUtils.fetchAllActionResults(results, signedActions);
for (WSSecurityEngineResult samlResult : samlResults) {
AssertionWrapper assertionWrapper =
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=1459843&r1=1459842&r2=1459843&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
Fri Mar 22 15:25:03 2013
@@ -100,6 +100,7 @@ import org.apache.cxf.ws.security.policy
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.tokenstore.TokenStore;
import org.apache.cxf.ws.security.tokenstore.TokenStoreFactory;
+import org.apache.cxf.ws.security.wss4j.WSS4JUtils;
import org.apache.neethi.Assertion;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSEncryptionPart;
@@ -2191,11 +2192,13 @@ public abstract class AbstractBindingBui
* signature results in the signatureActions list
*/
List<WSSecurityEngineResult> signatureActions = new
ArrayList<WSSecurityEngineResult>();
+ final List<Integer> signedActions = new ArrayList<Integer>(2);
+ signedActions.add(WSConstants.SIGN);
+ signedActions.add(WSConstants.UT_SIGN);
for (WSHandlerResult wshResult : results) {
- WSSecurityUtil.fetchAllActionResults(wshResult.getResults(),
- WSConstants.SIGN, signatureActions);
- WSSecurityUtil.fetchAllActionResults(wshResult.getResults(),
- WSConstants.UT_SIGN, signatureActions);
+ signatureActions.addAll(
+ WSS4JUtils.fetchAllActionResults(wshResult.getResults(),
signedActions)
+ );
}
sigConfList = new ArrayList<WSEncryptionPart>();
Modified:
cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java?rev=1459843&r1=1459842&r2=1459843&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
(original)
+++
cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
Fri Mar 22 15:25:03 2013
@@ -24,7 +24,6 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import java.util.Vector;
import java.util.concurrent.Executor;
import javax.xml.namespace.NamespaceContext;
@@ -75,7 +74,6 @@ import org.apache.ws.security.components
import org.apache.ws.security.components.crypto.CryptoType;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.handler.WSHandlerResult;
-import org.apache.ws.security.util.WSSecurityUtil;
public abstract class AbstractPolicySecurityTest extends AbstractSecurityTest {
protected PolicyBuilder policyBuilder;
@@ -446,16 +444,14 @@ public abstract class AbstractPolicySecu
assertNotNull(handlerResults);
assertSame(handlerResults.size(), 1);
- List<WSSecurityEngineResult> protectionResults = new
Vector<WSSecurityEngineResult>();
-
WSSecurityUtil.fetchAllActionResults(handlerResults.get(0).getResults(),
- WSConstants.ENCR, protectionResults);
+ final List<WSSecurityEngineResult> protectionResults =
+
WSS4JUtils.fetchAllActionResults(handlerResults.get(0).getResults(),
WSConstants.ENCR);
assertNotNull(protectionResults);
//
// This result should contain a reference to the decrypted element
//
- final Map<String, Object> result = protectionResults
- .get(0);
+ final Map<String, Object> result = protectionResults.get(0);
final List<WSDataRef> protectedElements =
CastUtils.cast((List<?>)result.get(WSSecurityEngineResult.TAG_DATA_REF_URIS));
assertNotNull(protectedElements);
