Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS178.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS178.java?rev=1034484&r1=1034483&r2=1034484&view=diff ============================================================================== --- webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS178.java (original) +++ webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS178.java Fri Nov 12 17:32:10 2010 @@ -27,6 +27,7 @@ import org.apache.commons.logging.LogFac import org.apache.ws.security.WSConstants; import org.apache.ws.security.WSPasswordCallback; import org.apache.ws.security.WSSecurityEngine; +import org.apache.ws.security.WSSecurityEngineResult; import org.apache.ws.security.components.crypto.Crypto; import org.apache.ws.security.components.crypto.CryptoFactory; import org.apache.ws.security.message.WSSecEncrypt; @@ -186,7 +187,7 @@ public class TestWSSecurityWSS178 extend * @param envelope * @throws Exception Thrown when there is a problem in verification */ - private java.util.List verify(Document doc) throws Exception { + private java.util.List<WSSecurityEngineResult> verify(Document doc) throws Exception { return secEngine.processSecurityHeader(doc, null, this, crypto); }
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS194.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS194.java?rev=1034484&r1=1034483&r2=1034484&view=diff ============================================================================== --- webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS194.java (original) +++ webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS194.java Fri Nov 12 17:32:10 2010 @@ -36,6 +36,7 @@ import org.apache.ws.security.WSConstant import org.apache.ws.security.WSPasswordCallback; import org.apache.ws.security.WSSConfig; import org.apache.ws.security.WSSecurityEngine; +import org.apache.ws.security.WSSecurityEngineResult; import org.apache.ws.security.components.crypto.CryptoFactory; import org.apache.ws.security.handler.RequestData; import org.apache.ws.security.handler.WSHandlerConstants; @@ -95,7 +96,7 @@ public class TestWSSecurityWSS194 extend reqData.setWssConfig(cfg); reqData.setUsername("alice"); reqData.setPwType(WSConstants.PASSWORD_TEXT); - java.util.Map messageContext = new java.util.TreeMap(); + java.util.Map<String, Object> messageContext = new java.util.TreeMap<String, Object>(); messageContext.put( WSHandlerConstants.PW_CALLBACK_REF, this @@ -109,7 +110,7 @@ public class TestWSSecurityWSS194 extend messageContext.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference"); reqData.setMsgContext(messageContext); - final java.util.List actions = new java.util.Vector(); + final java.util.List<Integer> actions = new java.util.Vector<Integer>(); actions.add(new Integer(WSConstants.UT)); actions.add(new Integer(WSConstants.SIGN)); final Document doc = SOAPUtil.toSOAPPart(SOAPMSG); @@ -141,8 +142,8 @@ public class TestWSSecurityWSS194 extend * @param doc * @throws Exception Thrown when there is a problem in verification */ - private List verify(Document doc) throws Exception { - List results = + private List<WSSecurityEngineResult> verify(Document doc) throws Exception { + List<WSSecurityEngineResult> results = secEngine.processSecurityHeader( doc, null, this, CryptoFactory.getInstance("wss40CA.properties") ); Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS245.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS245.java?rev=1034484&r1=1034483&r2=1034484&view=diff ============================================================================== --- webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS245.java (original) +++ webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS245.java Fri Nov 12 17:32:10 2010 @@ -92,14 +92,14 @@ public class TestWSSecurityWSS245 extend reqData.setWssConfig(cfg); reqData.setUsername("bob"); reqData.setPwType(WSConstants.PASSWORD_TEXT); - java.util.Map messageContext = new java.util.TreeMap(); + java.util.Map<String, Object> messageContext = new java.util.TreeMap<String, Object>(); messageContext.put( WSHandlerConstants.PW_CALLBACK_REF, new MyCallbackHandler() ); reqData.setMsgContext(messageContext); - final java.util.Vector actions = new java.util.Vector(); + final java.util.List<Integer> actions = new java.util.Vector<Integer>(); actions.add(new Integer(WSConstants.UT)); Document doc = SOAPUtil.toSOAPPart(SOAPMSG); MyHandler handler = new MyHandler(); @@ -133,9 +133,9 @@ public class TestWSSecurityWSS245 extend reqData.setWssConfig(cfg); reqData.setUsername("bob"); reqData.setPwType(WSConstants.PASSWORD_TEXT); - reqData.setMsgContext(new java.util.TreeMap()); + reqData.setMsgContext(new java.util.TreeMap<String, String>()); - final java.util.Vector actions = new java.util.Vector(); + final java.util.List<Integer> actions = new java.util.Vector<Integer>(); actions.add(new Integer(WSConstants.UT)); Document doc = SOAPUtil.toSOAPPart(SOAPMSG); MyHandler handler = new MyHandler(); Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS40.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS40.java?rev=1034484&r1=1034483&r2=1034484&view=diff ============================================================================== --- webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS40.java (original) +++ webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS40.java Fri Nov 12 17:32:10 2010 @@ -133,7 +133,7 @@ public class TestWSSecurityWSS40 extends // // Verify the signature // - List results = verify(signedDoc, cryptoCA); + List<WSSecurityEngineResult> results = verify(signedDoc, cryptoCA); WSSecurityEngineResult result = WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN); X509Certificate cert = @@ -164,7 +164,7 @@ public class TestWSSecurityWSS40 extends // Verify the signature // Crypto serverCrypto = CryptoFactory.getInstance("wss40_server.properties"); - List results = verify(signedDoc, serverCrypto); + List<WSSecurityEngineResult> results = verify(signedDoc, serverCrypto); WSSecurityEngineResult result = WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN); X509Certificate cert = @@ -200,7 +200,7 @@ public class TestWSSecurityWSS40 extends // // Verify the signature // - List results = verify(signedDoc, cryptoCA); + List<WSSecurityEngineResult> results = verify(signedDoc, cryptoCA); WSSecurityEngineResult result = WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN); X509Certificate cert = @@ -285,14 +285,14 @@ public class TestWSSecurityWSS40 extends final RequestData reqData = new RequestData(); reqData.setWssConfig(cfg); reqData.setUsername("wss40"); - java.util.Map config = new java.util.TreeMap(); + java.util.Map<String, String> config = new java.util.TreeMap<String, String>(); config.put(WSHandlerConstants.SIG_PROP_FILE, "wss40.properties"); config.put("password", "security"); config.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference"); config.put(WSHandlerConstants.USE_SINGLE_CERTIFICATE, "false"); reqData.setMsgContext(config); - final java.util.Vector actions = new java.util.Vector(); + final java.util.List<Integer> actions = new java.util.Vector<Integer>(); actions.add(new Integer(action)); final Document doc = SOAPUtil.toSOAPPart(SOAPMSG); MyHandler handler = new MyHandler(); @@ -307,7 +307,7 @@ public class TestWSSecurityWSS40 extends // // Verify the signature // - List results = verify(doc, cryptoCA); + List<WSSecurityEngineResult> results = verify(doc, cryptoCA); WSSecurityEngineResult result = WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN); X509Certificate cert = @@ -326,8 +326,9 @@ public class TestWSSecurityWSS40 extends * @param doc * @throws Exception Thrown when there is a problem in verification */ - private List verify(Document doc, Crypto crypto) throws WSSecurityException { - List results = secEngine.processSecurityHeader( + private List<WSSecurityEngineResult> + verify(Document doc, Crypto crypto) throws WSSecurityException { + List<WSSecurityEngineResult> results = secEngine.processSecurityHeader( doc, null, this, crypto ); if (LOG.isDebugEnabled()) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
