ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1669794 [2/3] - in /webservices/wss4j/trunk: integration/src/test/java/org/apache/wss4j/integration/test/kerberos/ ws-security-dom/src/main/java/org/apache/wss4j/dom/ ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/ ws-security-...
Date Sat, 28 Mar 2015 15:39:04 GMT
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java Sat Mar 28 15:39:03 2015
@@ -20,7 +20,6 @@
 package org.apache.wss4j.dom.message;
 
 import java.security.cert.X509Certificate;
-import java.util.List;
 
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSSConfig;
@@ -32,6 +31,7 @@ import org.apache.wss4j.common.crypto.Cr
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.handler.RequestData;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.dom.util.WSSecurityUtil;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -104,9 +104,9 @@ public class SignatureCRLTest extends or
         //
         // Verify the signature
         //
-        List<WSSecurityEngineResult> results = verify(signedDoc, cryptoCA, false);
+        WSHandlerResult results = verify(signedDoc, cryptoCA, false);
         WSSecurityEngineResult result = 
-            WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+            results.getActionResults().get(WSConstants.SIGN).get(0);
         X509Certificate cert = 
             (X509Certificate)result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
         assertTrue (cert != null);
@@ -186,14 +186,13 @@ public class SignatureCRLTest extends or
      * @param doc 
      * @throws Exception Thrown when there is a problem in verification
      */
-    private List<WSSecurityEngineResult> 
-    verify(Document doc, Crypto crypto, boolean revocationEnabled) throws Exception {
+    private WSHandlerResult verify(Document doc, Crypto crypto, boolean revocationEnabled) throws Exception {
         WSSecurityEngine secEngine = new WSSecurityEngine();
         RequestData reqData = new RequestData();
         reqData.setSigVerCrypto(crypto);
         reqData.setEnableRevocation(revocationEnabled);
         Element securityHeader = WSSecurityUtil.getSecurityHeader(doc, null);
-        List<WSSecurityEngineResult> results = 
+        WSHandlerResult results = 
             secEngine.processSecurityHeader(securityHeader, reqData);
         if (LOG.isDebugEnabled()) {
             LOG.debug("Verfied and decrypted message:");

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java Sat Mar 28 15:39:03 2015
@@ -20,13 +20,11 @@
 package org.apache.wss4j.dom.message;
 
 import java.util.Collections;
-import java.util.List;
 import java.util.regex.Pattern;
 
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSSConfig;
 import org.apache.wss4j.dom.WSSecurityEngine;
-import org.apache.wss4j.dom.WSSecurityEngineResult;
 import org.apache.wss4j.dom.common.SOAPUtil;
 import org.apache.wss4j.dom.common.SecurityTestUtil;
 import org.apache.wss4j.common.crypto.Crypto;
@@ -34,6 +32,7 @@ import org.apache.wss4j.common.crypto.Cr
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.handler.RequestData;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.dom.util.WSSecurityUtil;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -129,7 +128,7 @@ public class SignatureCertConstraintsTes
         }
     }
     
-    private List<WSSecurityEngineResult> verify(
+    private WSHandlerResult verify(
         Element securityHeader, Crypto sigCrypto, String certConstraint
     ) throws Exception {
         WSSecurityEngine secEngine = new WSSecurityEngine();

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java Sat Mar 28 15:39:03 2015
@@ -34,12 +34,11 @@ import org.apache.wss4j.common.util.XMLU
 import org.apache.wss4j.dom.handler.HandlerAction;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;
-import org.apache.wss4j.dom.util.WSSecurityUtil;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.w3c.dom.Document;
 
 import java.security.cert.X509Certificate;
 import java.util.Collections;
-import java.util.List;
 import java.util.Properties;
 
 /**
@@ -112,9 +111,9 @@ public class SignatureCertTest extends o
         //
         // Verify the signature
         //
-        List<WSSecurityEngineResult> results = verify(signedDoc, cryptoCA);
+        WSHandlerResult results = verify(signedDoc, cryptoCA);
         WSSecurityEngineResult result = 
-            WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+            results.getActionResults().get(WSConstants.SIGN).get(0);
         X509Certificate cert = 
             (X509Certificate)result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
         assertTrue (cert != null);
@@ -152,9 +151,9 @@ public class SignatureCertTest extends o
         // Verify the signature
         //
         Crypto serverCrypto = CryptoFactory.getInstance("wss40_server.properties");
-        List<WSSecurityEngineResult> results = verify(signedDoc, serverCrypto);
+        WSHandlerResult results = verify(signedDoc, serverCrypto);
         WSSecurityEngineResult result = 
-            WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+            results.getActionResults().get(WSConstants.SIGN).get(0);
         X509Certificate cert = 
             (X509Certificate)result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
         assertTrue (cert != null);
@@ -189,9 +188,9 @@ public class SignatureCertTest extends o
         //
         // Verify the signature
         //
-        List<WSSecurityEngineResult> results = verify(signedDoc, cryptoCA);
+        WSHandlerResult results = verify(signedDoc, cryptoCA);
         WSSecurityEngineResult result = 
-            WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+            results.getActionResults().get(WSConstants.SIGN).get(0);
         X509Certificate cert = 
             (X509Certificate)result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
         assertTrue (cert != null);
@@ -296,9 +295,9 @@ public class SignatureCertTest extends o
         //
         // Verify the signature
         //
-        List<WSSecurityEngineResult> results = verify(doc, cryptoCA);
+        WSHandlerResult results = verify(doc, cryptoCA);
         WSSecurityEngineResult result = 
-            WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+            results.getActionResults().get(WSConstants.SIGN).get(0);
         X509Certificate cert = 
             (X509Certificate)result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
         assertTrue (cert != null);
@@ -392,9 +391,8 @@ public class SignatureCertTest extends o
      * @param doc 
      * @throws Exception Thrown when there is a problem in verification
      */
-    private List<WSSecurityEngineResult> 
-    verify(Document doc, Crypto crypto) throws Exception {
-        List<WSSecurityEngineResult> results = secEngine.processSecurityHeader(
+    private WSHandlerResult verify(Document doc, Crypto crypto) throws Exception {
+        WSHandlerResult results = secEngine.processSecurityHeader(
             doc, null, null, crypto
         );
         if (LOG.isDebugEnabled()) {

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java Sat Mar 28 15:39:03 2015
@@ -31,11 +31,11 @@ import org.apache.wss4j.dom.common.Secur
 import org.apache.wss4j.dom.handler.HandlerAction;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.common.WSEncryptionPart;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.util.XMLUtils;
-import org.apache.wss4j.dom.util.WSSecurityUtil;
 import org.w3c.dom.Document;
 
 import javax.security.auth.callback.CallbackHandler;
@@ -172,13 +172,13 @@ public class SignatureEncryptionTest ext
             LOG.debug(outputString);
         }
         
-        List<WSSecurityEngineResult> results = verify(encryptedSignedDoc);
+        WSHandlerResult results = verify(encryptedSignedDoc);
         
         List<WSSecurityEngineResult> sigSecEngResults = 
-            WSSecurityUtil.fetchAllActionResults(results, WSConstants.SIGN);
+            results.getActionResults().get(WSConstants.SIGN);
         
         List<WSSecurityEngineResult> encSecEngResults = 
-            WSSecurityUtil.fetchAllActionResults(results, WSConstants.ENCR);
+            results.getActionResults().get(WSConstants.ENCR);
         
         assertEquals(1, sigSecEngResults.size());
         assertEquals(1, encSecEngResults.size());
@@ -397,7 +397,7 @@ public class SignatureEncryptionTest ext
         handler.receive(receivingActions, reqData);
         
         WSSecurityEngine newEngine = new WSSecurityEngine();
-        newEngine.processSecurityHeader(doc, null, reqData);
+        newEngine.processSecurityHeader(doc, reqData);
     }
     
     @org.junit.Test
@@ -442,7 +442,7 @@ public class SignatureEncryptionTest ext
         handler.receive(receivingActions, reqData);
         
         WSSecurityEngine newEngine = new WSSecurityEngine();
-        newEngine.processSecurityHeader(doc, null, reqData);
+        newEngine.processSecurityHeader(doc, reqData);
     }
 
     /**
@@ -455,8 +455,8 @@ public class SignatureEncryptionTest ext
      * @throws Exception
      *             Thrown when there is a problem in verification
      */
-    private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
-        List<WSSecurityEngineResult> resultList = 
+    private WSHandlerResult verify(Document doc) throws Exception {
+        WSHandlerResult resultList = 
             secEngine.processSecurityHeader(doc, null, callbackHandler, crypto);
         if (LOG.isDebugEnabled()) {
             String outputString = 

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java Sat Mar 28 15:39:03 2015
@@ -20,7 +20,6 @@
 package org.apache.wss4j.dom.message;
 
 import java.util.Collections;
-import java.util.List;
 
 import org.apache.wss4j.common.principal.PublicKeyPrincipal;
 import org.w3c.dom.Document;
@@ -35,7 +34,7 @@ import org.apache.wss4j.dom.WSSecurityEn
 import org.apache.wss4j.dom.common.SOAPUtil;
 import org.apache.wss4j.dom.common.SecurityTestUtil;
 import org.apache.wss4j.dom.handler.RequestData;
-import org.apache.wss4j.dom.util.WSSecurityUtil;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 
 /**
  * This class tests signing where the the public key is transmitted in the message via
@@ -81,11 +80,11 @@ public class SignatureKeyValueTest exten
         RequestData data = new RequestData();
         data.setSigVerCrypto(crypto);
         data.setIgnoredBSPRules(Collections.singletonList(BSPRule.R5417));
-        final List<WSSecurityEngineResult> results = 
-            secEngine.processSecurityHeader(signedDoc, "", data);
+        final WSHandlerResult results = 
+            secEngine.processSecurityHeader(signedDoc, data);
 
         WSSecurityEngineResult actionResult = 
-            WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+            results.getActionResults().get(WSConstants.SIGN).get(0);
         assertTrue(actionResult != null);
         
         java.security.Principal principal = 
@@ -125,7 +124,7 @@ public class SignatureKeyValueTest exten
             RequestData data = new RequestData();
             data.setSigVerCrypto(crypto);
             data.setIgnoredBSPRules(Collections.singletonList(BSPRule.R5417));
-            secEngine.processSecurityHeader(signedDoc, "", data);
+            secEngine.processSecurityHeader(signedDoc, data);
             fail("Failure expected on bad public key");
         } catch (Exception ex) {
             // expected
@@ -158,11 +157,11 @@ public class SignatureKeyValueTest exten
         RequestData data = new RequestData();
         data.setSigVerCrypto(crypto);
         data.setIgnoredBSPRules(Collections.singletonList(BSPRule.R5417));
-        final List<WSSecurityEngineResult> results = 
-            secEngine.processSecurityHeader(signedDoc, "", data);
+        final WSHandlerResult results = 
+            secEngine.processSecurityHeader(signedDoc, data);
         
         WSSecurityEngineResult actionResult = 
-            WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+            results.getActionResults().get(WSConstants.SIGN).get(0);
         assertTrue(actionResult != null);
         
         java.security.Principal principal = 

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java Sat Mar 28 15:39:03 2015
@@ -30,6 +30,7 @@ import org.apache.wss4j.dom.WSSecurityEn
 import org.apache.wss4j.dom.common.SAML1CallbackHandler;
 import org.apache.wss4j.dom.common.SOAPUtil;
 import org.apache.wss4j.dom.common.SecurityTestUtil;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.Merlin;
@@ -121,10 +122,10 @@ public class SignaturePartsTest extends
             LOG.debug(outputString);
         }
         
-        List<WSSecurityEngineResult> results = verify(signedDoc);
+        WSHandlerResult results = verify(signedDoc);
         
         WSSecurityEngineResult actionResult = 
-            WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+            results.getActionResults().get(WSConstants.SIGN).get(0);
         assertTrue(actionResult != null);
         assertFalse(actionResult.isEmpty());
         final List<WSDataRef> refs =
@@ -322,17 +323,17 @@ public class SignaturePartsTest extends
         trustStore.load(input, "security".toCharArray());
         ((Merlin)trustCrypto).setTrustStore(trustStore);
         
-        List<WSSecurityEngineResult> results = 
+        WSHandlerResult results = 
             secEngine.processSecurityHeader(doc, null, null, trustCrypto);
         WSSecurityEngineResult stUnsignedActionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_SIGNED);
+            results.getActionResults().get(WSConstants.ST_SIGNED).get(0);
         SamlAssertionWrapper receivedSamlAssertion =
             (SamlAssertionWrapper) stUnsignedActionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedSamlAssertion != null);
         assertTrue(receivedSamlAssertion.isSigned());
         
         WSSecurityEngineResult signActionResult = 
-            WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+            results.getActionResults().get(WSConstants.SIGN).get(0);
         assertTrue(signActionResult != null);
         assertFalse(signActionResult.isEmpty());
         final List<WSDataRef> refs =
@@ -438,14 +439,14 @@ public class SignaturePartsTest extends
             LOG.debug(outputString);
         }
         
-        List<WSSecurityEngineResult> results = verify(signedDoc);
+        WSHandlerResult results = verify(signedDoc);
         
         QName fooName = new QName("urn:foo.bar", "foobar");
         QName bodyName = new QName(soapConstants.getEnvelopeURI(), "Body");
         QName headerName = new QName(soapConstants.getEnvelopeURI(), "Header");
         
         WSSecurityEngineResult actionResult = 
-            WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+            results.getActionResults().get(WSConstants.SIGN).get(0);
         assertTrue(actionResult != null);
         assertFalse(actionResult.isEmpty());
         
@@ -506,10 +507,10 @@ public class SignaturePartsTest extends
             LOG.debug(outputString);
         }
         
-        List<WSSecurityEngineResult> results = verify(signedDoc);
+        WSHandlerResult results = verify(signedDoc);
         
         WSSecurityEngineResult actionResult = 
-            WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+            results.getActionResults().get(WSConstants.SIGN).get(0);
         assertTrue(actionResult != null);
         assertFalse(actionResult.isEmpty());
         @SuppressWarnings("unchecked")
@@ -560,8 +561,8 @@ public class SignaturePartsTest extends
      * @param doc 
      * @throws Exception Thrown when there is a problem in verification
      */
-    private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
-        List<WSSecurityEngineResult> results = 
+    private WSHandlerResult verify(Document doc) throws Exception {
+        WSHandlerResult results = 
             secEngine.processSecurityHeader(doc, null, null, crypto);
         if (LOG.isDebugEnabled()) {
             LOG.debug("Verfied and decrypted message:");

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java Sat Mar 28 15:39:03 2015
@@ -44,6 +44,7 @@ import org.apache.wss4j.dom.common.Secur
 import org.apache.wss4j.dom.handler.HandlerAction;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.dom.str.STRParser.REFERENCE_TYPE;
 import org.apache.wss4j.dom.util.WSSecurityUtil;
 import org.w3c.dom.Document;
@@ -96,10 +97,10 @@ public class SignatureTest extends org.j
             LOG.debug(outputString);
         }
         LOG.info("After Signing IS....");
-        List<WSSecurityEngineResult> results = verify(signedDoc);
+        WSHandlerResult results = verify(signedDoc);
         
         WSSecurityEngineResult actionResult =
-                WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+            results.getActionResults().get(WSConstants.SIGN).get(0);
         assertNotNull(actionResult.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE));
         assertNotNull(actionResult.get(WSSecurityEngineResult.TAG_X509_REFERENCE_TYPE));
         REFERENCE_TYPE referenceType = 
@@ -126,10 +127,10 @@ public class SignatureTest extends org.j
             LOG.debug(outputString);
         }
         LOG.info("After Signing IS....");
-        List<WSSecurityEngineResult> results = verify(signedDoc);
+        WSHandlerResult results = verify(signedDoc);
         
         WSSecurityEngineResult actionResult =
-                WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+            results.getActionResults().get(WSConstants.SIGN).get(0);
         assertNotNull(actionResult.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE));
         assertNotNull(actionResult.get(WSSecurityEngineResult.TAG_X509_REFERENCE_TYPE));
         REFERENCE_TYPE referenceType = 
@@ -220,7 +221,7 @@ public class SignatureTest extends org.j
         ignoredRules.add(BSPRule.R5404);
         ignoredRules.add(BSPRule.R5406);
         data.setIgnoredBSPRules(ignoredRules);
-        newEngine.processSecurityHeader(doc, "", data);
+        newEngine.processSecurityHeader(doc, data);
     }
     
     /**
@@ -276,10 +277,10 @@ public class SignatureTest extends org.j
             LOG.debug(outputString);
         }
         
-        List<WSSecurityEngineResult> results = verify(signedDoc);
+        WSHandlerResult results = verify(signedDoc);
         
         WSSecurityEngineResult actionResult =
-                WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+            results.getActionResults().get(WSConstants.SIGN).get(0);
         assertNotNull(actionResult.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE));
         assertNotNull(actionResult.get(WSSecurityEngineResult.TAG_X509_REFERENCE_TYPE));
         REFERENCE_TYPE referenceType = 
@@ -342,11 +343,11 @@ public class SignatureTest extends org.j
         }
         
         WSSecurityEngine newEngine = new WSSecurityEngine();
-        List<WSSecurityEngineResult> results = 
+        WSHandlerResult results = 
             newEngine.processSecurityHeader(doc, null, null, crypto);
 
         WSSecurityEngineResult actionResult =
-                WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+            results.getActionResults().get(WSConstants.SIGN).get(0);
         assertNotNull(actionResult.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE));
         assertNotNull(actionResult.get(WSSecurityEngineResult.TAG_X509_REFERENCE_TYPE));
         REFERENCE_TYPE referenceType = 
@@ -382,10 +383,10 @@ public class SignatureTest extends org.j
         }
         LOG.info("After Signing ThumbprintSHA1....");
         
-        List<WSSecurityEngineResult> results = verify(signedDoc);
+        WSHandlerResult results = verify(signedDoc);
         
         WSSecurityEngineResult actionResult =
-                WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+            results.getActionResults().get(WSConstants.SIGN).get(0);
         assertNotNull(actionResult.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE));
         assertNotNull(actionResult.get(WSSecurityEngineResult.TAG_X509_REFERENCE_TYPE));
         REFERENCE_TYPE referenceType = 
@@ -415,10 +416,10 @@ public class SignatureTest extends org.j
         }
         LOG.info("After Signing ThumbprintSHA1....");
         
-        List<WSSecurityEngineResult> results = verify(signedDoc);
+        WSHandlerResult results = verify(signedDoc);
         
         WSSecurityEngineResult actionResult =
-                WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+            results.getActionResults().get(WSConstants.SIGN).get(0);
         assertNotNull(actionResult.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE));
         assertNotNull(actionResult.get(WSSecurityEngineResult.TAG_X509_REFERENCE_TYPE));
         REFERENCE_TYPE referenceType = 
@@ -769,12 +770,12 @@ public class SignatureTest extends org.j
             LOG.debug(outputString);
         }
         
-        List<WSSecurityEngineResult> results = verify(doc);
-        
+        WSHandlerResult results = verify(doc);
+            
         List<Integer> receivedActions = new ArrayList<>();
         receivedActions.add(WSConstants.SIGN);
         receivedActions.add(WSConstants.TS);
-        assertTrue(handler.checkResults(results, receivedActions));
+        assertTrue(handler.checkResults(results.getResults(), receivedActions));
     }
     
     @org.junit.Test
@@ -890,9 +891,10 @@ public class SignatureTest extends org.j
         data.setIgnoredBSPRules(disabledRules);
         
         WSSecurityEngine newSecEngine = new WSSecurityEngine();
-        List<WSSecurityEngineResult> results = 
-            newSecEngine.processSecurityHeader(doc, "", data);
-        assertTrue(handler.checkResults(results, Collections.singletonList(WSConstants.SIGN)));
+        WSHandlerResult results = 
+            newSecEngine.processSecurityHeader(doc, data);
+        assertTrue(handler.checkResults(results.getResults(), 
+                                        Collections.singletonList(WSConstants.SIGN)));
     }
     
     @org.junit.Test
@@ -927,7 +929,7 @@ public class SignatureTest extends org.j
      * @param env soap envelope
      * @throws java.lang.Exception Thrown when there is a problem in verification
      */
-    private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
+    private WSHandlerResult verify(Document doc) throws Exception {
         return secEngine.processSecurityHeader(doc, null, null, crypto);
     }
 

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java Sat Mar 28 15:39:03 2015
@@ -32,13 +32,13 @@ import org.apache.wss4j.common.util.XMLU
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSSConfig;
 import org.apache.wss4j.dom.WSSecurityEngine;
-import org.apache.wss4j.dom.WSSecurityEngineResult;
 import org.apache.wss4j.dom.common.CustomHandler;
 import org.apache.wss4j.dom.common.SOAPUtil;
 import org.apache.wss4j.dom.common.SecurityTestUtil;
 import org.apache.wss4j.dom.handler.HandlerAction;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.dom.util.WSSecurityUtil;
 import org.w3c.dom.Document;
 
@@ -154,8 +154,9 @@ public class SignedBSTTest extends org.j
             LOG.debug(outputString);
         }
         
-        List<WSSecurityEngineResult> results = verify(doc);
-        assertTrue(handler.checkResults(results, Collections.singletonList(WSConstants.SIGN)));
+        WSHandlerResult results = verify(doc);
+        assertTrue(handler.checkResults(results.getResults(), 
+                                        Collections.singletonList(WSConstants.SIGN)));
     }
 
     /**
@@ -165,8 +166,8 @@ public class SignedBSTTest extends org.j
      * @param doc 
      * @throws Exception Thrown when there is a problem in verification
      */
-    private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
-        List<WSSecurityEngineResult> results = 
+    private WSHandlerResult verify(Document doc) throws Exception {
+        WSHandlerResult results = 
             secEngine.processSecurityHeader(doc, null, null, crypto);
         if (LOG.isDebugEnabled()) {
             LOG.debug("Verfied and decrypted message:");

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java Sat Mar 28 15:39:03 2015
@@ -38,8 +38,8 @@ import org.apache.wss4j.dom.WSSecurityEn
 import org.apache.wss4j.dom.common.SOAPUtil;
 import org.apache.wss4j.dom.common.SecurityTestUtil;
 import org.apache.wss4j.dom.handler.RequestData;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.dom.message.token.Timestamp;
-import org.apache.wss4j.dom.util.WSSecurityUtil;
 import org.apache.wss4j.dom.util.XmlSchemaDateFormat;
 import org.apache.wss4j.dom.validate.NoOpValidator;
 import org.w3c.dom.Document;
@@ -81,9 +81,9 @@ public class TimestampTest extends org.j
         //
         // Do some processing
         //
-        List<WSSecurityEngineResult> wsResult = verify(createdDoc, WSSConfig.getNewInstance());
+        WSHandlerResult wsResult = verify(createdDoc, WSSConfig.getNewInstance());
         WSSecurityEngineResult actionResult = 
-            WSSecurityUtil.fetchActionResult(wsResult, WSConstants.TS);
+            wsResult.getActionResults().get(WSConstants.TS).get(0);
         assertTrue(actionResult != null);
         
         Timestamp receivedTimestamp = 
@@ -119,9 +119,9 @@ public class TimestampTest extends org.j
         //
         // Do some processing
         //
-        List<WSSecurityEngineResult> wsResult = verify(createdDoc, WSSConfig.getNewInstance());
+        WSHandlerResult wsResult = verify(createdDoc, WSSConfig.getNewInstance());
         WSSecurityEngineResult actionResult = 
-            WSSecurityUtil.fetchActionResult(wsResult, WSConstants.TS);
+            wsResult.getActionResults().get(WSConstants.TS).get(0);
         assertTrue(actionResult != null);
         
         Timestamp receivedTimestamp = 
@@ -816,9 +816,9 @@ public class TimestampTest extends org.j
         //
         // Do some processing
         //
-        List<WSSecurityEngineResult> wsResult = verify(createdDoc, WSSConfig.getNewInstance());
+        WSHandlerResult wsResult = verify(createdDoc, WSSConfig.getNewInstance());
         WSSecurityEngineResult actionResult = 
-            WSSecurityUtil.fetchActionResult(wsResult, WSConstants.TS);
+            wsResult.getActionResults().get(WSConstants.TS).get(0);
         assertTrue(actionResult != null);
     }
     
@@ -840,9 +840,9 @@ public class TimestampTest extends org.j
             //
             // Do some processing
             //
-            List<WSSecurityEngineResult> wsResult = verify(createdDoc, WSSConfig.getNewInstance());
+            WSHandlerResult wsResult = verify(createdDoc, WSSConfig.getNewInstance());
             WSSecurityEngineResult actionResult = 
-                WSSecurityUtil.fetchActionResult(wsResult, WSConstants.TS);
+                wsResult.getActionResults().get(WSConstants.TS).get(0);
             assertTrue(actionResult != null);
         } finally {
             Locale.setDefault(defaultLocale);
@@ -852,38 +852,38 @@ public class TimestampTest extends org.j
     /**
      * Verifies the soap envelope
      */
-    private List<WSSecurityEngineResult> verify(
+    private WSHandlerResult verify(
         Document doc, WSSConfig wssConfig
     ) throws Exception {
         WSSecurityEngine secEngine = new WSSecurityEngine();
         RequestData requestData = new RequestData();
         requestData.setWssConfig(wssConfig);
-        return secEngine.processSecurityHeader(doc, "", requestData);
+        return secEngine.processSecurityHeader(doc, requestData);
     }
     
     /**
      * Verifies the soap envelope
      */
-    private List<WSSecurityEngineResult> verify(
+    private WSHandlerResult verify(
         Document doc, List<BSPRule> ignoredRules
     ) throws Exception {
         WSSecurityEngine secEngine = new WSSecurityEngine();
         RequestData requestData = new RequestData();
         requestData.setIgnoredBSPRules(ignoredRules);
-        return secEngine.processSecurityHeader(doc, "", requestData);
+        return secEngine.processSecurityHeader(doc, requestData);
     }
     
     /**
      * Verifies the soap envelope
      */
-    private List<WSSecurityEngineResult> verify(
+    private WSHandlerResult verify(
         Document doc, WSSConfig wssConfig, List<BSPRule> ignoredRules
     ) throws Exception {
         WSSecurityEngine secEngine = new WSSecurityEngine();
         RequestData requestData = new RequestData();
         requestData.setWssConfig(wssConfig);
         requestData.setIgnoredBSPRules(ignoredRules);
-        return secEngine.processSecurityHeader(doc, "", requestData);
+        return secEngine.processSecurityHeader(doc, requestData);
     }
     
     

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java Sat Mar 28 15:39:03 2015
@@ -22,7 +22,6 @@ package org.apache.wss4j.dom.message;
 import java.security.MessageDigest;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.List;
 
 import javax.security.auth.callback.CallbackHandler;
 
@@ -42,6 +41,7 @@ import org.apache.wss4j.dom.common.SOAPU
 import org.apache.wss4j.dom.common.SecurityTestUtil;
 import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler;
 import org.apache.wss4j.dom.handler.RequestData;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.dom.message.token.UsernameToken;
 import org.apache.wss4j.dom.util.WSSecurityUtil;
 import org.apache.xml.security.utils.Base64;
@@ -370,9 +370,9 @@ public class UTDerivedKeyTest extends or
             LOG.debug(outputString);
         }
         
-        List<WSSecurityEngineResult> results = verify(signedDoc);
+        WSHandlerResult results = verify(signedDoc);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+            results.getActionResults().get(WSConstants.SIGN).get(0);
         java.security.Principal principal = 
             (java.security.Principal) actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
         // System.out.println(principal.getName());
@@ -423,11 +423,11 @@ public class UTDerivedKeyTest extends or
         WSSecurityEngine newEngine = new WSSecurityEngine();
         newEngine.getWssConfig().setPasswordsAreEncoded(true);
         newEngine.getWssConfig().setAllowUsernameTokenNoPassword(true);
-        List<WSSecurityEngineResult> results =  newEngine.processSecurityHeader(
+        WSHandlerResult results = newEngine.processSecurityHeader(
             signedDoc, null, new EncodedPasswordCallbackHandler(), null
         );
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+            results.getActionResults().get(WSConstants.SIGN).get(0);
         java.security.Principal principal = 
             (java.security.Principal) actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
         // System.out.println(principal.getName());
@@ -688,7 +688,7 @@ public class UTDerivedKeyTest extends or
         WSSecurityEngine engine = new WSSecurityEngine();
         config.setAllowUsernameTokenNoPassword(true);
         engine.setWssConfig(config);
-        engine.processSecurityHeader(doc, "", data);
+        engine.processSecurityHeader(doc, data);
     }
 
     
@@ -751,7 +751,7 @@ public class UTDerivedKeyTest extends or
         config.setAllowUsernameTokenNoPassword(true);
         newEngine.setWssConfig(config);
         data.setIgnoredBSPRules(Collections.singletonList(BSPRule.R4214));
-        newEngine.processSecurityHeader(encryptedDoc, "", data);
+        newEngine.processSecurityHeader(encryptedDoc, data);
     }
 
     
@@ -817,7 +817,7 @@ public class UTDerivedKeyTest extends or
         WSSConfig config = WSSConfig.getNewInstance();
         config.setAllowUsernameTokenNoPassword(true);
         newEngine.setWssConfig(config);
-        newEngine.processSecurityHeader(encryptedDoc, "", data);
+        newEngine.processSecurityHeader(encryptedDoc, data);
     }
 
     
@@ -827,11 +827,11 @@ public class UTDerivedKeyTest extends or
      * @param env soap envelope
      * @throws java.lang.Exception Thrown when there is a problem in verification
      */
-    private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
+    private WSHandlerResult verify(Document doc) throws Exception {
         return verify(doc, true);
     }
     
-    private List<WSSecurityEngineResult> verify(
+    private WSHandlerResult verify(
         Document doc, 
         boolean allowUsernameTokenDerivedKeys
     ) throws Exception {

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java Sat Mar 28 15:39:03 2015
@@ -34,13 +34,12 @@ import org.apache.wss4j.common.util.XMLU
 import org.apache.wss4j.dom.handler.HandlerAction;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;
-import org.apache.wss4j.dom.util.WSSecurityUtil;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.w3c.dom.Document;
 
 import javax.security.auth.callback.CallbackHandler;
 
 import java.util.Collections;
-import java.util.List;
 
 /**
  * WS-Security Test Case for UsernameToken Key Derivation, as defined in the 
@@ -99,9 +98,9 @@ public class UTSignatureTest extends org
             LOG.debug(outputString);
         }
         
-        List<WSSecurityEngineResult> results = verify(signedDoc);
+        WSHandlerResult results = verify(signedDoc);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.UT_SIGN);
+            results.getActionResults().get(WSConstants.UT_SIGN).get(0);
         java.security.Principal principal = 
             (java.security.Principal) actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
         assertTrue(principal.getName().contains("bob"));
@@ -189,9 +188,9 @@ public class UTSignatureTest extends org
             LOG.debug(outputString);
         }
         
-        List<WSSecurityEngineResult> results = verify(doc);
+        WSHandlerResult results = verify(doc);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.UT_SIGN);
+            results.getActionResults().get(WSConstants.UT_SIGN).get(0);
         java.security.Principal principal = 
             (java.security.Principal) actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
         assertTrue(principal.getName().contains("bob"));
@@ -233,9 +232,9 @@ public class UTSignatureTest extends org
             LOG.debug(outputString);
         }
         
-        List<WSSecurityEngineResult> results = verify(doc);
+        WSHandlerResult results = verify(doc);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.UT_SIGN);
+            results.getActionResults().get(WSConstants.UT_SIGN).get(0);
         java.security.Principal principal = 
             (java.security.Principal) actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
         assertTrue(principal.getName().contains("bob"));
@@ -247,11 +246,11 @@ public class UTSignatureTest extends org
      * @param doc soap envelope
      * @throws java.lang.Exception Thrown when there is a problem in verification
      */
-    private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
+    private WSHandlerResult verify(Document doc) throws Exception {
         return verify(doc, true);
     }
     
-    private List<WSSecurityEngineResult> verify(
+    private WSHandlerResult verify(
         Document doc, 
         boolean allowUsernameTokenDerivedKeys
     ) throws Exception {

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java Sat Mar 28 15:39:03 2015
@@ -24,7 +24,6 @@ import java.security.MessageDigest;
 import java.text.DateFormat;
 import java.util.Collections;
 import java.util.Date;
-import java.util.List;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
@@ -48,8 +47,8 @@ import org.apache.wss4j.dom.common.Usern
 import org.apache.wss4j.dom.handler.HandlerAction;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.dom.message.token.UsernameToken;
-import org.apache.wss4j.dom.util.WSSecurityUtil;
 import org.apache.wss4j.dom.util.XmlSchemaDateFormat;
 import org.apache.xml.security.utils.Base64;
 import org.w3c.dom.Document;
@@ -140,9 +139,9 @@ public class UsernameTokenTest extends o
         }
         LOG.info("After adding UsernameToken PW Digest....");
         
-        List<WSSecurityEngineResult> results = verify(signedDoc);
+        WSHandlerResult results = verify(signedDoc);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.UT);
+            results.getActionResults().get(WSConstants.UT).get(0);
         UsernameToken receivedToken = 
             (UsernameToken) actionResult.get(WSSecurityEngineResult.TAG_USERNAME_TOKEN);
         assertTrue(receivedToken != null);
@@ -432,9 +431,9 @@ public class UsernameTokenTest extends o
         }
         LOG.info("After adding UsernameToken PW Text....");
 
-        List<WSSecurityEngineResult> results = verify(signedDoc);
+        WSHandlerResult results = verify(signedDoc);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.UT);
+            results.getActionResults().get(WSConstants.UT).get(0);
         UsernameToken receivedToken = 
             (UsernameToken) actionResult.get(WSSecurityEngineResult.TAG_USERNAME_TOKEN);
         assertTrue(receivedToken != null);
@@ -529,7 +528,7 @@ public class UsernameTokenTest extends o
         RequestData data = new RequestData();
         data.setCallbackHandler(callbackHandler);
         data.setIgnoredBSPRules(Collections.singletonList(BSPRule.R4201));
-        newEngine.processSecurityHeader(doc, "", data);
+        newEngine.processSecurityHeader(doc, data);
     }
     
     /**
@@ -573,9 +572,9 @@ public class UsernameTokenTest extends o
             LOG.debug(outputString);
         }
         
-        List<WSSecurityEngineResult> results = verify(signedDoc, true);
+        WSHandlerResult results = verify(signedDoc, true);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.UT_NOPASSWORD);
+            results.getActionResults().get(WSConstants.UT_NOPASSWORD).get(0);
         UsernameToken receivedToken = 
             (UsernameToken) actionResult.get(WSSecurityEngineResult.TAG_USERNAME_TOKEN);
         assertTrue(receivedToken != null);
@@ -919,7 +918,7 @@ public class UsernameTokenTest extends o
         RequestData data = new RequestData();
         data.setCallbackHandler(callbackHandler);
         data.setIgnoredBSPRules(Collections.singletonList(BSPRule.R4225));
-        newEngine.processSecurityHeader(doc, "", data);
+        newEngine.processSecurityHeader(doc, data);
     }
     
     /**
@@ -962,7 +961,7 @@ public class UsernameTokenTest extends o
         RequestData data = new RequestData();
         data.setCallbackHandler(callbackHandler);
         data.setIgnoredBSPRules(Collections.singletonList(BSPRule.R4223));
-        newEngine.processSecurityHeader(doc, "", data);
+        newEngine.processSecurityHeader(doc, data);
     }
     
     /**
@@ -1005,7 +1004,7 @@ public class UsernameTokenTest extends o
         RequestData data = new RequestData();
         data.setCallbackHandler(callbackHandler);
         data.setIgnoredBSPRules(Collections.singletonList(BSPRule.R4222));
-        newEngine.processSecurityHeader(doc, "", data);
+        newEngine.processSecurityHeader(doc, data);
     }
     
     /**
@@ -1049,7 +1048,7 @@ public class UsernameTokenTest extends o
         RequestData data = new RequestData();
         data.setCallbackHandler(callbackHandler);
         data.setIgnoredBSPRules(Collections.singletonList(BSPRule.R4221));
-        newEngine.processSecurityHeader(doc, "", data);
+        newEngine.processSecurityHeader(doc, data);
     }
     
     @org.junit.Test
@@ -1124,7 +1123,7 @@ public class UsernameTokenTest extends o
     }
 
     
-    private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
+    private WSHandlerResult verify(Document doc) throws Exception {
         return verify(doc, false);
     }
     
@@ -1134,7 +1133,7 @@ public class UsernameTokenTest extends o
      * @param env soap envelope
      * @throws java.lang.Exception Thrown when there is a problem in verification
      */
-    private List<WSSecurityEngineResult> verify(Document doc, boolean allowUsernameTokenDerivedKeys) throws Exception {
+    private WSHandlerResult verify(Document doc, boolean allowUsernameTokenDerivedKeys) throws Exception {
         WSSecurityEngine secEngine = new WSSecurityEngine();
         WSSConfig config = WSSConfig.getNewInstance();
         config.setAllowUsernameTokenNoPassword(allowUsernameTokenDerivedKeys);

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java Sat Mar 28 15:39:03 2015
@@ -34,6 +34,7 @@ import org.apache.wss4j.common.token.Bin
 import org.apache.wss4j.common.util.KeyUtils;
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.handler.RequestData;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.dom.message.WSSecEncrypt;
 import org.apache.wss4j.dom.message.WSSecSignature;
 import org.apache.wss4j.dom.message.WSSecHeader;
@@ -50,7 +51,6 @@ import javax.security.auth.callback.Call
 import javax.xml.crypto.dsig.SignatureMethod;
 
 import java.util.Arrays;
-import java.util.List;
 
 /**
  * This is a test for the Kerberos Token Profile 1.1
@@ -200,9 +200,9 @@ public class BSTKerberosTest extends org
             LOG.debug(outputString);
         }
         
-        List<WSSecurityEngineResult> results = verify(doc);
-        WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.BST);
+        WSHandlerResult results = verify(doc);
+        WSSecurityEngineResult actionResult = 
+            results.getActionResults().get(WSConstants.BST).get(0);
         BinarySecurity token =
             (BinarySecurity)actionResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
         assertTrue(token != null);
@@ -417,8 +417,8 @@ public class BSTKerberosTest extends org
      * @param doc 
      * @throws Exception Thrown when there is a problem in verification
      */
-    private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
-        List<WSSecurityEngineResult> results = 
+    private WSHandlerResult verify(Document doc) throws Exception {
+        WSHandlerResult results = 
             secEngine.processSecurityHeader(doc, null, callbackHandler, crypto);
         if (LOG.isDebugEnabled()) {
             LOG.debug("Verfied and decrypted message:");

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java Sat Mar 28 15:39:03 2015
@@ -25,6 +25,7 @@ import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSSecurityEngineResult;
 import org.apache.wss4j.dom.common.SOAPUtil;
 import org.apache.wss4j.dom.common.SecurityTestUtil;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.common.bsp.BSPEnforcer;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
@@ -39,7 +40,6 @@ import org.apache.wss4j.dom.util.WSSecur
 import org.w3c.dom.Document;
 
 import java.security.cert.X509Certificate;
-import java.util.List;
 
 /**
  * This is a test for constructing and processing BinarySecurityTokens.
@@ -85,11 +85,11 @@ public class BinarySecurityTokenTest ext
         
         WSSecurityEngine secEngine = new WSSecurityEngine();
         secEngine.setWssConfig(WSSConfig.getNewInstance());
-        List<WSSecurityEngineResult> results = 
+        WSHandlerResult results = 
             secEngine.processSecurityHeader(doc, null, null, crypto);
         
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.BST);
+            results.getActionResults().get(WSConstants.BST).get(0);
         BinarySecurity token =
             (BinarySecurity)actionResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
         assertNotNull(token);
@@ -126,11 +126,11 @@ public class BinarySecurityTokenTest ext
         
         WSSecurityEngine secEngine = new WSSecurityEngine();
         secEngine.setWssConfig(WSSConfig.getNewInstance());
-        List<WSSecurityEngineResult> results = 
+        WSHandlerResult results = 
             secEngine.processSecurityHeader(doc, null, null, crypto);
         
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.BST);
+            results.getActionResults().get(WSConstants.BST).get(0);
         PKIPathSecurity token =
             (PKIPathSecurity)actionResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
         assertNotNull(token);
@@ -176,10 +176,10 @@ public class BinarySecurityTokenTest ext
         secHeader.insertSecurityHeader(doc);
         WSSecurityUtil.prependChildElement(secHeader.getSecurityHeader(), bst.getElement());
         
-        List<WSSecurityEngineResult> results = 
+        WSHandlerResult results = 
             secEngine.processSecurityHeader(doc, null, null, crypto);
         WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.BST);
+            results.getActionResults().get(WSConstants.BST).get(0);
         BinarySecurity token =
             (BinarySecurity)actionResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
         assertNotNull(token);

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java Sat Mar 28 15:39:03 2015
@@ -30,11 +30,11 @@ import org.apache.wss4j.common.ext.WSSec
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.WSSConfig;
 import org.apache.wss4j.dom.WSSecurityEngine;
-import org.apache.wss4j.dom.WSSecurityEngineResult;
 import org.apache.wss4j.dom.common.SOAPUtil;
 import org.apache.wss4j.dom.common.SecurityTestUtil;
 import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler;
 import org.apache.wss4j.dom.handler.RequestData;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.w3c.dom.Document;
 
 
@@ -119,27 +119,27 @@ public class WCFUsernameTokenTest extend
     /**
      * Verifies the soap envelope
      */
-    private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
+    private WSHandlerResult verify(Document doc) throws Exception {
         return verify(doc, new ArrayList<BSPRule>(0));
     }
     
     /**
      * Verifies the soap envelope
      */
-    private List<WSSecurityEngineResult> verify(
+    private WSHandlerResult verify(
         Document doc, List<BSPRule> ignoredRules
     ) throws Exception {
         WSSecurityEngine secEngine = new WSSecurityEngine();
         RequestData requestData = new RequestData();
         requestData.setIgnoredBSPRules(ignoredRules);
         requestData.setCallbackHandler(callbackHandler);
-        return secEngine.processSecurityHeader(doc, "", requestData);
+        return secEngine.processSecurityHeader(doc, requestData);
     }
     
     /**
      * Verifies the soap envelope
      */
-    private List<WSSecurityEngineResult> verify(
+    private WSHandlerResult verify(
         Document doc, WSSConfig wssConfig, List<BSPRule> ignoredRules
     ) throws Exception {
         WSSecurityEngine secEngine = new WSSecurityEngine();
@@ -147,7 +147,7 @@ public class WCFUsernameTokenTest extend
         requestData.setWssConfig(wssConfig);
         requestData.setIgnoredBSPRules(ignoredRules);
         requestData.setCallbackHandler(callbackHandler);
-        return secEngine.processSecurityHeader(doc, "", requestData);
+        return secEngine.processSecurityHeader(doc, requestData);
     }
     
 

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java Sat Mar 28 15:39:03 2015
@@ -48,6 +48,7 @@ import org.apache.wss4j.dom.common.SOAPU
 import org.apache.wss4j.dom.common.SecurityTestUtil;
 import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler;
 import org.apache.wss4j.dom.handler.RequestData;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.dom.message.WSSecHeader;
 import org.apache.wss4j.dom.message.WSSecSAMLToken;
 import org.apache.wss4j.dom.message.WSSecUsernameToken;
@@ -87,9 +88,10 @@ public class PrincipalTest extends org.j
                 XMLUtils.PrettyDocumentToString(signedDoc);
             LOG.debug(outputString);
         }
-        List<WSSecurityEngineResult> results = verify(signedDoc, null);
+        WSHandlerResult results = verify(signedDoc, null);
         
-        Principal principal = (Principal)results.get(0).get(WSSecurityEngineResult.TAG_PRINCIPAL);
+        Principal principal = 
+            (Principal)results.getResults().get(0).get(WSSecurityEngineResult.TAG_PRINCIPAL);
         assertTrue(principal instanceof UsernameTokenPrincipal);
         assertTrue("wernerd".equals(principal.getName()));
         UsernameTokenPrincipal userPrincipal = (UsernameTokenPrincipal)principal;
@@ -118,10 +120,11 @@ public class PrincipalTest extends org.j
                 XMLUtils.PrettyDocumentToString(signedDoc);
             LOG.debug(outputString);
         }
-        List<WSSecurityEngineResult> results = 
+        WSHandlerResult results = 
             verify(signedDoc, new DummyValidator(), WSSecurityEngine.USERNAME_TOKEN, null);
         
-        Principal principal = (Principal)results.get(0).get(WSSecurityEngineResult.TAG_PRINCIPAL);
+        Principal principal = 
+            (Principal)results.getResults().get(0).get(WSSecurityEngineResult.TAG_PRINCIPAL);
         assertTrue(principal instanceof SAMLTokenPrincipal);
         assertTrue(principal.getName().contains("uid=joe"));
         assertTrue(((SAMLTokenPrincipal)principal).getToken() != null);
@@ -154,15 +157,17 @@ public class PrincipalTest extends org.j
             LOG.debug(outputString);
         }
         
-        List<WSSecurityEngineResult> results = verify(unsignedDoc, null);
-        WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+        WSHandlerResult results = verify(unsignedDoc, null);
+        
+        List<WSSecurityEngineResult> samlResults = 
+            results.getActionResults().get(WSConstants.ST_UNSIGNED);
+        WSSecurityEngineResult actionResult = samlResults.get(0);
+
         SamlAssertionWrapper receivedSamlAssertion =
             (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedSamlAssertion != null);
         
-        Principal principal = 
-            (Principal)results.get(0).get(WSSecurityEngineResult.TAG_PRINCIPAL);
+        Principal principal = (Principal)actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
         assertTrue(principal instanceof SAMLTokenPrincipal);
         assertTrue(principal.getName().contains("uid=joe"));
         assertTrue(((SAMLTokenPrincipal)principal).getToken() != null);
@@ -195,15 +200,17 @@ public class PrincipalTest extends org.j
             LOG.debug(outputString);
         }
         
-        List<WSSecurityEngineResult> results = verify(unsignedDoc, null);
-        WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+        WSHandlerResult results = verify(unsignedDoc, null);
+        
+        List<WSSecurityEngineResult> samlResults = 
+            results.getActionResults().get(WSConstants.ST_UNSIGNED);
+        WSSecurityEngineResult actionResult = samlResults.get(0);
+        
         SamlAssertionWrapper receivedSamlAssertion =
             (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedSamlAssertion != null);
         
-        Principal principal = 
-            (Principal)results.get(0).get(WSSecurityEngineResult.TAG_PRINCIPAL);
+        Principal principal = (Principal)actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
         assertTrue(principal instanceof SAMLTokenPrincipal);
         assertTrue(principal.getName().contains("uid=joe"));
         assertTrue(((SAMLTokenPrincipal)principal).getToken() != null);
@@ -237,16 +244,18 @@ public class PrincipalTest extends org.j
             LOG.debug(outputString);
         }
         
-        List<WSSecurityEngineResult> results = 
+        WSHandlerResult results = 
             verify(unsignedDoc, new DummyValidator(), WSSecurityEngine.SAML_TOKEN, null);
-        WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
+        
+        List<WSSecurityEngineResult> samlResults = 
+            results.getActionResults().get(WSConstants.ST_UNSIGNED);
+        WSSecurityEngineResult actionResult = samlResults.get(0);
+
         SamlAssertionWrapper receivedSamlAssertion =
             (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedSamlAssertion != null);
         
-        Principal principal = 
-            (Principal)results.get(0).get(WSSecurityEngineResult.TAG_PRINCIPAL);
+        Principal principal = (Principal)actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
         assertTrue(principal instanceof SAMLTokenPrincipal);
         assertTrue(principal.getName().contains("uid=joe"));
         assertTrue(((SAMLTokenPrincipal)principal).getToken() != null);
@@ -278,16 +287,18 @@ public class PrincipalTest extends org.j
             LOG.debug(outputString);
         }
         
-        List<WSSecurityEngineResult> results = 
+        WSHandlerResult results = 
             verify(doc, new DummyValidator(), WSSecurityEngine.BINARY_TOKEN, crypto);
-        WSSecurityEngineResult actionResult =
-            WSSecurityUtil.fetchActionResult(results, WSConstants.BST);
+        
+        List<WSSecurityEngineResult> bstResults = 
+            results.getActionResults().get(WSConstants.BST);
+        WSSecurityEngineResult actionResult = bstResults.get(0);
+
         BinarySecurity token =
             (BinarySecurity)actionResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
         assertNotNull(token);
         
-        Principal principal = 
-            (Principal)results.get(0).get(WSSecurityEngineResult.TAG_PRINCIPAL);
+        Principal principal = (Principal)actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
         assertTrue(principal instanceof SAMLTokenPrincipal);
         assertTrue(principal.getName().contains("uid=joe"));
         assertTrue(((SAMLTokenPrincipal)principal).getToken() != null);
@@ -296,7 +307,7 @@ public class PrincipalTest extends org.j
     /**
      * Verifies the soap envelope
      */
-    private List<WSSecurityEngineResult> verify(
+    private WSHandlerResult verify(
         Document doc,
         Crypto crypto
     ) throws Exception {
@@ -306,7 +317,7 @@ public class PrincipalTest extends org.j
     /**
      * Verifies the soap envelope
      */
-    private List<WSSecurityEngineResult> verify(
+    private WSHandlerResult verify(
         Document doc, 
         Validator validator,
         QName validatorName,

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java Sat Mar 28 15:39:03 2015
@@ -31,6 +31,7 @@ import org.apache.wss4j.dom.WSSecurityEn
 import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
 import org.apache.wss4j.dom.common.SOAPUtil;
 import org.apache.wss4j.dom.common.SecurityTestUtil;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.common.WSEncryptionPart;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
@@ -139,12 +140,12 @@ public class EncryptedKeyDataRefTest ext
     private void checkDataRef(Document doc) throws Exception {
         
         // Retrieve the wsResults List 
-        List<WSSecurityEngineResult> wsResults = 
+        WSHandlerResult wsResults = 
             secEngine.processSecurityHeader(doc, null, callbackHandler, crypto);
         boolean found = false;
                 
-        for (int i = 0; i < wsResults.size(); i++) {
-            WSSecurityEngineResult wsSecEngineResult = wsResults.get(i);
+        for (int i = 0; i < wsResults.getResults().size(); i++) {
+            WSSecurityEngineResult wsSecEngineResult = wsResults.getResults().get(i);
             int action = (Integer)
                     wsSecEngineResult.get(WSSecurityEngineResult.TAG_ACTION);
             

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java Sat Mar 28 15:39:03 2015
@@ -31,6 +31,7 @@ import org.apache.wss4j.dom.WSSecurityEn
 import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
 import org.apache.wss4j.dom.common.SOAPUtil;
 import org.apache.wss4j.dom.common.SecurityTestUtil;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.common.WSEncryptionPart;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
@@ -135,12 +136,12 @@ public class ReferenceListDataRefTest ex
     private void checkDataRef(Document doc) throws Exception {
         
         // Retrieve the wsResults List 
-        List<WSSecurityEngineResult> wsResults = 
+        WSHandlerResult wsResults = 
             secEngine.processSecurityHeader(doc, null, callbackHandler, crypto);
         boolean found = false;
                 
-        for (int i = 0; i < wsResults.size(); i++) {
-            WSSecurityEngineResult wsSecEngineResult = wsResults.get(i);
+        for (int i = 0; i < wsResults.getResults().size(); i++) {
+            WSSecurityEngineResult wsSecEngineResult = wsResults.getResults().get(i);
             int action = (Integer)
                     wsSecEngineResult.get(WSSecurityEngineResult.TAG_ACTION);
             

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java Sat Mar 28 15:39:03 2015
@@ -19,8 +19,6 @@
 
 package org.apache.wss4j.dom.saml;
 
-import java.util.List;
-
 import org.apache.wss4j.common.saml.SamlAssertionWrapper;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -31,11 +29,11 @@ import org.apache.wss4j.common.ext.WSSec
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSSConfig;
 import org.apache.wss4j.dom.WSSecurityEngine;
-import org.apache.wss4j.dom.WSSecurityEngineResult;
 import org.apache.wss4j.dom.common.SAML1CallbackHandler;
 import org.apache.wss4j.dom.common.SOAPUtil;
 import org.apache.wss4j.dom.common.SecurityTestUtil;
 import org.apache.wss4j.dom.handler.RequestData;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.dom.message.WSSecHeader;
 import org.apache.wss4j.dom.message.WSSecSAMLToken;
 import org.apache.wss4j.common.saml.SAMLCallback;
@@ -201,7 +199,7 @@ public class SamlAlgorithmSuiteTest exte
         return algorithmSuite;
     }
 
-    private List<WSSecurityEngineResult> verify(
+    private WSHandlerResult verify(
         Element securityHeader, AlgorithmSuite algorithmSuite, Crypto sigVerCrypto,
         boolean saml2
     ) throws Exception {

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java Sat Mar 28 15:39:03 2015
@@ -19,8 +19,6 @@
 
 package org.apache.wss4j.dom.saml;
 
-import java.util.List;
-
 import javax.security.auth.callback.CallbackHandler;
 
 import org.apache.wss4j.common.ext.WSSecurityException;
@@ -30,12 +28,12 @@ import org.apache.wss4j.common.saml.Saml
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.WSSConfig;
 import org.apache.wss4j.dom.WSSecurityEngine;
-import org.apache.wss4j.dom.WSSecurityEngineResult;
 import org.apache.wss4j.dom.common.CustomSamlAssertionValidator;
 import org.apache.wss4j.dom.common.SAML1CallbackHandler;
 import org.apache.wss4j.dom.common.SAML2CallbackHandler;
 import org.apache.wss4j.dom.common.SOAPUtil;
 import org.apache.wss4j.dom.common.SecurityTestUtil;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.dom.message.WSSecHeader;
 import org.apache.wss4j.dom.message.WSSecSAMLToken;
 import org.joda.time.DateTime;
@@ -196,8 +194,8 @@ public class SamlAuthnTest extends org.j
      * @param envelope 
      * @throws Exception Thrown when there is a problem in verification
      */
-    private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
-        List<WSSecurityEngineResult> results = 
+    private WSHandlerResult verify(Document doc) throws Exception {
+        WSHandlerResult results = 
             secEngine.processSecurityHeader(doc, null, null, null);
         String outputString = 
             XMLUtils.PrettyDocumentToString(doc);

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java Sat Mar 28 15:39:03 2015
@@ -35,13 +35,13 @@ import org.apache.wss4j.common.saml.bean
 import org.apache.wss4j.common.util.XMLUtils;
 import org.apache.wss4j.dom.WSSConfig;
 import org.apache.wss4j.dom.WSSecurityEngine;
-import org.apache.wss4j.dom.WSSecurityEngineResult;
 import org.apache.wss4j.dom.common.CustomSamlAssertionValidator;
 import org.apache.wss4j.dom.common.SAML1CallbackHandler;
 import org.apache.wss4j.dom.common.SAML2CallbackHandler;
 import org.apache.wss4j.dom.common.SOAPUtil;
 import org.apache.wss4j.dom.common.SecurityTestUtil;
 import org.apache.wss4j.dom.handler.RequestData;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.dom.message.WSSecHeader;
 import org.apache.wss4j.dom.message.WSSecSAMLToken;
 import org.joda.time.DateTime;
@@ -498,7 +498,7 @@ public class SamlConditionsTest extends
         newEngine.setWssConfig(config);
         
         try {
-            newEngine.processSecurityHeader(doc, "", data);
+            newEngine.processSecurityHeader(doc, data);
             fail("Failure expected on a bad audience restriction");
         } catch (WSSecurityException ex) {
             // expected
@@ -508,7 +508,7 @@ public class SamlConditionsTest extends
         audiences.add("http://apache.org/one");
         data.setAudienceRestrictions(audiences);
         
-        newEngine.processSecurityHeader(doc, "", data);
+        newEngine.processSecurityHeader(doc, data);
     }
     
     // Now test AudienceRestrictions with supplied restrictions
@@ -561,7 +561,7 @@ public class SamlConditionsTest extends
         newEngine.setWssConfig(config);
         
         try {
-            newEngine.processSecurityHeader(doc, "", data);
+            newEngine.processSecurityHeader(doc, data);
             fail("Failure expected on a bad audience restriction");
         } catch (WSSecurityException ex) {
             // expected
@@ -571,7 +571,7 @@ public class SamlConditionsTest extends
         audiences.add("http://apache.org/one");
         data.setAudienceRestrictions(audiences);
         
-        newEngine.processSecurityHeader(doc, "", data);
+        newEngine.processSecurityHeader(doc, data);
     }
     
     /**
@@ -677,7 +677,7 @@ public class SamlConditionsTest extends
         newEngine.setWssConfig(config);
         
         try {
-            newEngine.processSecurityHeader(doc, "", data);
+            newEngine.processSecurityHeader(doc, data);
             fail("Failure expected on a bad audience restriction");
         } catch (WSSecurityException ex) {
             // expected
@@ -687,7 +687,7 @@ public class SamlConditionsTest extends
         audiences.add("http://apache.org/one");
         data.setAudienceRestrictions(audiences);
         
-        newEngine.processSecurityHeader(doc, "", data);
+        newEngine.processSecurityHeader(doc, data);
     }
     
     private void createAndVerifyMessage(
@@ -729,8 +729,8 @@ public class SamlConditionsTest extends
      * @param envelope 
      * @throws Exception Thrown when there is a problem in verification
      */
-    private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
-        List<WSSecurityEngineResult> results = 
+    private WSHandlerResult verify(Document doc) throws Exception {
+        WSHandlerResult results = 
             secEngine.processSecurityHeader(doc, null, null, null);
         String outputString = 
             XMLUtils.PrettyDocumentToString(doc);

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java?rev=1669794&r1=1669793&r2=1669794&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java Sat Mar 28 15:39:03 2015
@@ -23,13 +23,13 @@ import org.apache.wss4j.common.saml.Saml
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSSConfig;
 import org.apache.wss4j.dom.WSSecurityEngine;
-import org.apache.wss4j.dom.WSSecurityEngineResult;
 import org.apache.wss4j.dom.common.AbstractSAMLCallbackHandler;
 import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
 import org.apache.wss4j.dom.common.SAML1CallbackHandler;
 import org.apache.wss4j.dom.common.SAML2CallbackHandler;
 import org.apache.wss4j.dom.common.SOAPUtil;
 import org.apache.wss4j.dom.common.SecurityTestUtil;
+import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.CryptoType;
@@ -54,7 +54,6 @@ import javax.security.auth.callback.Unsu
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.KeyStore;
-import java.util.List;
 
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -386,8 +385,8 @@ public class SamlNegativeTest extends or
      * @param doc
      * @throws Exception Thrown when there is a problem in verification
      */
-    private List<WSSecurityEngineResult> verify(Document doc, Crypto sigCrypto) throws Exception {
-        List<WSSecurityEngineResult> results = 
+    private WSHandlerResult verify(Document doc, Crypto sigCrypto) throws Exception {
+        WSHandlerResult results = 
             secEngine.processSecurityHeader(
                 doc, null, callbackHandler, sigCrypto, userCrypto
             );



Mime
View raw message