ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1040987 - in /webservices/wss4j/trunk: interop/org/apache/ws/axis/oasis/ping/ src/org/apache/ws/axis/security/ src/org/apache/ws/security/ src/org/apache/ws/security/action/ src/org/apache/ws/security/components/crypto/ src/org/apache/ws/s...
Date Wed, 01 Dec 2010 12:56:31 GMT
Author: coheigea
Date: Wed Dec  1 12:56:29 2010
New Revision: 1040987

URL: http://svn.apache.org/viewvc?rev=1040987&view=rev
Log:
Changed from Vectors to ArrayLists.

Modified:
    webservices/wss4j/trunk/interop/org/apache/ws/axis/oasis/ping/PingBindingImpl.java
    webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllReceiver.java
    webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllSender.java
    webservices/wss4j/trunk/src/org/apache/ws/security/WSDocInfo.java
    webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngine.java
    webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureConfirmationAction.java
    webservices/wss4j/trunk/src/org/apache/ws/security/action/UsernameTokenSignedAction.java
    webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/Crypto.java
    webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoBase.java
    webservices/wss4j/trunk/src/org/apache/ws/security/handler/RequestData.java
    webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java
    webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandlerConstants.java
    webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSS4JHandler.java
    webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java
    webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSign.java
    webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
    webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignature.java
    webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignatureBase.java
    webservices/wss4j/trunk/src/org/apache/ws/security/message/token/Timestamp.java
    webservices/wss4j/trunk/src/org/apache/ws/security/processor/EncryptedKeyProcessor.java
    webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java
    webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java
    webservices/wss4j/trunk/src/org/apache/ws/security/processor/UsernameTokenProcessor.java
    webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSecSignatureSAML.java
    webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java
    webservices/wss4j/trunk/test/wssec/PasswordTypeTest.java
    webservices/wss4j/trunk/test/wssec/SignatureConfirmationTest.java
    webservices/wss4j/trunk/test/wssec/TestModifiedRequest.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityDataRef.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityDataRef1.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityEncryptionParts.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityGetPassword.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityKerberosTokenProfile.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityNew13.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityNew15.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityNew17.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityNew18.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityNew3.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityNew5.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityNew6.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityResultsOrder.java
    webservices/wss4j/trunk/test/wssec/TestWSSecuritySAMLKeyIdentifier.java
    webservices/wss4j/trunk/test/wssec/TestWSSecuritySignatureParts.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityUTSignature.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityUserProcessor.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS194.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS245.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS40.java

Modified: webservices/wss4j/trunk/interop/org/apache/ws/axis/oasis/ping/PingBindingImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/interop/org/apache/ws/axis/oasis/ping/PingBindingImpl.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/interop/org/apache/ws/axis/oasis/ping/PingBindingImpl.java (original)
+++ webservices/wss4j/trunk/interop/org/apache/ws/axis/oasis/ping/PingBindingImpl.java Wed Dec  1 12:56:29 2010
@@ -49,8 +49,8 @@ public class PingBindingImpl
         MessageContext msgContext = MessageContext.getCurrentContext();
         Message reqMsg = msgContext.getRequestMessage();
 
-        Vector results = 
-            (Vector) msgContext.getProperty(WSHandlerConstants.RECV_RESULTS);
+        List results = 
+            (List) msgContext.getProperty(WSHandlerConstants.RECV_RESULTS);
         if (results == null) {
             System.out.println("No security results!!");
         }

Modified: webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllReceiver.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllReceiver.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllReceiver.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllReceiver.java Wed Dec  1 12:56:29 2010
@@ -50,7 +50,6 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Vector;
 
 public class WSDoAllReceiver extends WSDoAllHandler {
 
@@ -87,7 +86,7 @@ public class WSDoAllReceiver extends WSD
         try {
             reqData.setMsgContext(msgContext);
 
-            List actions = new Vector();
+            List actions = new ArrayList();
             String action = null;
             if ((action = (String) getOption(WSHandlerConstants.ACTION)) == null) {
                 action = (String) msgContext
@@ -283,7 +282,7 @@ public class WSDoAllReceiver extends WSD
             List results = null;
             if ((results = (List) msgContext
                     .getProperty(WSHandlerConstants.RECV_RESULTS)) == null) {
-                results = new Vector();
+                results = new ArrayList();
                 msgContext
                         .setProperty(WSHandlerConstants.RECV_RESULTS, results);
             }

Modified: webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllSender.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllSender.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllSender.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/axis/security/WSDoAllSender.java Wed Dec  1 12:56:29 2010
@@ -36,8 +36,8 @@ import org.w3c.dom.Document;
 
 import java.io.ByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 
 /**
  * @author Werner Dittmann (werner@apache.org)
@@ -80,7 +80,7 @@ public class WSDoAllSender extends WSDoA
             /*
              * Get the action first.
              */
-            List actions = new Vector();
+            List actions = new ArrayList();
             String action = getString(WSHandlerConstants.ACTION, mc);
             if (action == null) {
                 throw new AxisFault("WSDoAllSender: No action defined");

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/WSDocInfo.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/WSDocInfo.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/WSDocInfo.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/WSDocInfo.java Wed Dec  1 12:56:29 2010
@@ -39,8 +39,8 @@ import org.apache.ws.security.processor.
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 
 public class WSDocInfo {
     Document doc = null;
@@ -81,7 +81,7 @@ public class WSDocInfo {
      */
     public void addTokenElement(Element elem) {
         if (tokenList == null) {
-            tokenList = new Vector<Element>();
+            tokenList = new ArrayList<Element>();
         }
         tokenList.add(elem);
     }
@@ -142,7 +142,7 @@ public class WSDocInfo {
      */
     public void setProcessor(Processor p) {
         if (processors == null) {
-            processors = new Vector<Processor>();
+            processors = new ArrayList<Processor>();
         }
         processors.add(p);
     }

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngine.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngine.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngine.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngine.java Wed Dec  1 12:56:29 2010
@@ -33,8 +33,8 @@ import org.w3c.dom.Node;
 import javax.security.auth.callback.CallbackHandler;
 import javax.xml.namespace.QName;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 
 /**
  * WS-Security Engine.
@@ -302,7 +302,7 @@ public class WSSecurityEngine {
         if (tlog.isDebugEnabled()) {
             t1 = System.currentTimeMillis();
         }
-        List<WSSecurityEngineResult> returnResults = new Vector<WSSecurityEngineResult>();
+        List<WSSecurityEngineResult> returnResults = new ArrayList<WSSecurityEngineResult>();
         final WSSConfig cfg = getWssConfig();
         Node node = securityHeader.getFirstChild();
         while (node != null) {

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureConfirmationAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureConfirmationAction.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureConfirmationAction.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureConfirmationAction.java Wed Dec  1 12:56:29 2010
@@ -33,8 +33,8 @@ import org.apache.ws.security.message.WS
 import org.apache.ws.security.util.WSSecurityUtil;
 import org.w3c.dom.Document;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 
 public class SignatureConfirmationAction implements Action {
     protected static Log log = LogFactory.getLog(WSHandler.class.getName());
@@ -57,7 +57,7 @@ public class SignatureConfirmationAction
         // Loop over all the (signature) results gathered by all the processors, and store
         // them in a list.
         //
-        List<WSSecurityEngineResult> signatureActions = new Vector<WSSecurityEngineResult>();
+        List<WSSecurityEngineResult> signatureActions = new ArrayList<WSSecurityEngineResult>();
         for (WSHandlerResult wshResult : results) {
             List<WSSecurityEngineResult> resultList = wshResult.getResults();
 

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/action/UsernameTokenSignedAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/action/UsernameTokenSignedAction.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/action/UsernameTokenSignedAction.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/action/UsernameTokenSignedAction.java Wed Dec  1 12:56:29 2010
@@ -19,8 +19,8 @@
 
 package org.apache.ws.security.action;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 
 import org.apache.ws.security.SOAPConstants;
 import org.apache.ws.security.WSConstants;
@@ -116,7 +116,7 @@ public class UsernameTokenSignedAction i
             if (soapConstants == null) {
                 soapConstants = WSSecurityUtil.getSOAPConstants(doc.getDocumentElement());
             }
-            parts = new Vector<WSEncryptionPart>();
+            parts = new ArrayList<WSEncryptionPart>();
             WSEncryptionPart encP = 
                 new WSEncryptionPart(WSConstants.ELEM_BODY, soapConstants.getEnvelopeURI(), "Content");
             parts.add(encP);

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/Crypto.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/Crypto.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/Crypto.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/Crypto.java Wed Dec  1 12:56:29 2010
@@ -219,7 +219,7 @@ public interface Crypto {
      * <p/>
      *
      * @param subjectDN The DN of subject to look for in the keystore
-     * @return Vector with all alias of certificates with the same DN as given in the parameters
+     * @return An array with all alias of certificates with the same DN as given in the parameters
      * @throws WSSecurityException
      */
     public String[] getAliasesForDN(String subjectDN) throws WSSecurityException;

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoBase.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoBase.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoBase.java Wed Dec  1 12:56:29 2010
@@ -47,6 +47,7 @@ import java.security.cert.TrustAnchor;
 import java.security.cert.X509Certificate;
 import java.security.interfaces.RSAPublicKey;
 import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -54,7 +55,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.Vector;
 import javax.security.auth.x500.X500Principal;
 
 /**
@@ -260,7 +260,7 @@ public abstract class CryptoBase impleme
 
     protected List<String> splitAndTrim(String inString) {
         X509NameTokenizer nmTokens = new X509NameTokenizer(inString);
-        List<String> vr = new Vector<String>();
+        List<String> vr = new ArrayList<String>();
 
         while (nmTokens.hasMoreTokens()) {
             vr.add(nmTokens.nextToken());
@@ -937,7 +937,7 @@ public abstract class CryptoBase impleme
     private List<String> getAliases(Object subjectRDN, KeyStore store) 
         throws WSSecurityException {
         // Store the aliases found
-        List<String> aliases = new Vector<String>();
+        List<String> aliases = new ArrayList<String>();
         Certificate cert = null;
         
         try {

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/handler/RequestData.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/handler/RequestData.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/handler/RequestData.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/handler/RequestData.java Wed Dec  1 12:56:29 2010
@@ -27,8 +27,8 @@ import org.apache.ws.security.components
 import org.apache.ws.security.message.WSSecHeader;
 import org.apache.ws.security.message.token.UsernameToken;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 import java.security.cert.X509Certificate;
 
 /**
@@ -49,18 +49,18 @@ public class RequestData {
     private int sigKeyId = 0;
     private String sigAlgorithm = null;
     private String signatureDigestAlgorithm = null;
-    private List<WSEncryptionPart> signatureParts = new Vector<WSEncryptionPart>();
+    private List<WSEncryptionPart> signatureParts = new ArrayList<WSEncryptionPart>();
     private Crypto encCrypto = null;
     private int encKeyId = 0;
     private String encSymmAlgo = null;
     private String encKeyTransport = null;
     private String encUser = null;
     private String signatureUser = null;
-    private List<WSEncryptionPart> encryptParts = new Vector<WSEncryptionPart>();
+    private List<WSEncryptionPart> encryptParts = new ArrayList<WSEncryptionPart>();
     private X509Certificate encCert = null;
     private int timeToLive = 300;   // Timestamp: time in seconds between creation and expiry
     private WSSConfig wssConfig = null;
-    private List<byte[]> signatureValues = new Vector<byte[]>();
+    private List<byte[]> signatureValues = new ArrayList<byte[]>();
     private WSSecHeader secHeader = null;
     private boolean encSymmetricEncryptionKey = true;
     private int secretKeyLength = WSConstants.WSE_DERIVED_KEY_LEN;

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java Wed Dec  1 12:56:29 2010
@@ -45,10 +45,10 @@ import javax.security.auth.callback.Call
 
 import java.security.cert.X509Certificate;
 import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.Vector;
 import java.util.concurrent.ConcurrentHashMap;
 
 
@@ -233,7 +233,7 @@ public abstract class WSHandler {
             List<byte[]> savedSignatures = 
                 (List<byte[]>)getProperty(reqData.getMsgContext(), WSHandlerConstants.SEND_SIGV);
             if (savedSignatures == null) {
-                savedSignatures = new Vector<byte[]>();
+                savedSignatures = new ArrayList<byte[]>();
                 setProperty(
                     reqData.getMsgContext(), WSHandlerConstants.SEND_SIGV, savedSignatures
                 );
@@ -311,7 +311,7 @@ public abstract class WSHandler {
     protected boolean checkReceiverResultsAnyOrder(
         List<WSSecurityEngineResult> wsResult, List<Integer> actions
     ) {
-        List<Integer> recordedActions = new Vector<Integer>(actions.size());
+        List<Integer> recordedActions = new ArrayList<Integer>(actions.size());
         for (Integer action : actions) {
             recordedActions.add(action);
         }
@@ -353,7 +353,7 @@ public abstract class WSHandler {
         // the current run of receiver (we can have more than one run: if we
         // have several security header blocks with different actors/roles)
         //
-        List<WSSecurityEngineResult> sigConf = new Vector<WSSecurityEngineResult>();
+        List<WSSecurityEngineResult> sigConf = new ArrayList<WSSecurityEngineResult>();
         WSSecurityUtil.fetchAllActionResults(resultList, WSConstants.SC, sigConf);
         //
         // now loop over all SignatureConfirmation results and check:

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandlerConstants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandlerConstants.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandlerConstants.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandlerConstants.java Wed Dec  1 12:56:29 2010
@@ -431,10 +431,10 @@ public class WSHandlerConstants {
     public final static String SIG_PROP_REF_ID = "SignaturePropRefId";
     
     /**
-     * The WSDoAllReceiver handler stores a result <code>Vector</code>
+     * The WSDoAllReceiver handler stores a result <code>List</code>
      * in this property.
      * <p/>
-     * The vector contains <code>WSHandlerResult</code> objects
+     * The list contains <code>WSHandlerResult</code> objects
      * for each chained WSDoAllReceiver handler.
      */
     public static final String RECV_RESULTS = "RECV_RESULTS";

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSS4JHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSS4JHandler.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSS4JHandler.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSS4JHandler.java Wed Dec  1 12:56:29 2010
@@ -50,9 +50,9 @@ import javax.xml.transform.stream.Stream
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Vector;
 
 /**
  * Merged and converted the the axis handlers WSDoAllReceiver and WSDoAllSender
@@ -189,7 +189,7 @@ public class WSS4JHandler extends WSHand
         /*
         * Get the action first.
         */
-        List<Integer> actions = new Vector<Integer>();
+        List<Integer> actions = new ArrayList<Integer>();
         String action = (String) getOption(WSHandlerConstants.SEND + '.' + WSHandlerConstants.ACTION);
         if (action == null) {
             action = (String) getOption(WSHandlerConstants.ACTION);
@@ -332,7 +332,7 @@ public class WSS4JHandler extends WSHand
     @SuppressWarnings("unchecked")
     public boolean doReceiver(MessageContext mc, RequestData reqData, boolean isRequest) throws WSSecurityException {
 
-        List<Integer> actions = new Vector<Integer>();
+        List<Integer> actions = new ArrayList<Integer>();
         String action = (String) getOption(WSHandlerConstants.RECEIVE + '.' + WSHandlerConstants.ACTION);
         if (action == null) {
             action = (String) getOption(WSHandlerConstants.ACTION);
@@ -488,7 +488,7 @@ public class WSS4JHandler extends WSHand
         List<WSHandlerResult> results = null;
         if ((results = (List<WSHandlerResult>) mc.getProperty(WSHandlerConstants.RECV_RESULTS))
                 == null) {
-            results = new Vector<WSHandlerResult>();
+            results = new ArrayList<WSHandlerResult>();
             mc.setProperty(WSHandlerConstants.RECV_RESULTS, results);
         }
         WSHandlerResult rResult =

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java Wed Dec  1 12:56:29 2010
@@ -33,8 +33,8 @@ import org.w3c.dom.Node;
 
 import javax.crypto.SecretKey;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 
 /**
  * Encrypts and signs parts of a message with derived keys derived from a
@@ -61,7 +61,7 @@ public class WSSecDKEncrypt extends WSSe
                 
         String soapNamespace = WSSecurityUtil.getSOAPNamespace(envelope);
         if (parts == null) {
-            parts = new Vector<WSEncryptionPart>();
+            parts = new ArrayList<WSEncryptionPart>();
             WSEncryptionPart encP = 
                 new WSEncryptionPart(
                     WSConstants.ELEM_BODY, 

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSign.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSign.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSign.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSign.java Wed Dec  1 12:56:29 2010
@@ -34,8 +34,8 @@ import org.apache.ws.security.util.WSSec
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 
 import javax.xml.crypto.URIDereferencer;
 import javax.xml.crypto.XMLStructure;
@@ -87,7 +87,7 @@ public class WSSecDKSign extends WSSecDe
         prepare(doc, secHeader);
         String soapNamespace = WSSecurityUtil.getSOAPNamespace(doc.getDocumentElement());
         if (parts == null) {
-            parts = new Vector<WSEncryptionPart>();
+            parts = new ArrayList<WSEncryptionPart>();
             WSEncryptionPart encP = 
                 new WSEncryptionPart(
                     WSConstants.ELEM_BODY,

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java Wed Dec  1 12:56:29 2010
@@ -46,8 +46,8 @@ import javax.crypto.SecretKey;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.X509Certificate;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 
 /**
  * Encrypts a parts of a message according to WS Specification, X509 profile,
@@ -259,7 +259,7 @@ public class WSSecEncrypt extends WSSecE
         }
         
         if (parts == null) {
-            parts = new Vector<WSEncryptionPart>();
+            parts = new ArrayList<WSEncryptionPart>();
             String soapNamespace = WSSecurityUtil.getSOAPNamespace(envelope);
             WSEncryptionPart encP = 
                 new WSEncryptionPart(
@@ -410,7 +410,7 @@ public class WSSecEncrypt extends WSSecE
             );
         }
 
-        List<String> encDataRef = new Vector<String>();
+        List<String> encDataRef = new ArrayList<String>();
         for (int part = 0; part < references.size(); part++) {
             WSEncryptionPart encPart = references.get(part);
 

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignature.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignature.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignature.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignature.java Wed Dec  1 12:56:29 2010
@@ -43,8 +43,8 @@ import org.w3c.dom.Element;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.X509Certificate;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 
 import javax.xml.crypto.URIDereferencer;
 import javax.xml.crypto.XMLStructure;
@@ -288,7 +288,7 @@ public class WSSecSignature extends WSSe
 
         prepare(doc, cr, secHeader);
         if (parts == null) {
-            parts = new Vector<WSEncryptionPart>();
+            parts = new ArrayList<WSEncryptionPart>();
             String soapNamespace = WSSecurityUtil.getSOAPNamespace(doc.getDocumentElement());
             WSEncryptionPart encP = 
                 new WSEncryptionPart(

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignatureBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignatureBase.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignatureBase.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignatureBase.java Wed Dec  1 12:56:29 2010
@@ -32,9 +32,9 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Vector;
 
 import javax.xml.crypto.XMLStructure;
 import javax.xml.crypto.dom.DOMStructure;
@@ -84,7 +84,7 @@ public class WSSecSignatureBase extends 
         }
         
         List<javax.xml.crypto.dsig.Reference> referenceList = 
-            new Vector<javax.xml.crypto.dsig.Reference>();
+            new ArrayList<javax.xml.crypto.dsig.Reference>();
 
         for (WSEncryptionPart encPart : references) {
             String idToSign = encPart.getId();
@@ -198,7 +198,7 @@ public class WSSecSignatureBase extends 
      * Get the List of inclusive prefixes from the DOM Element argument 
      */
     public List<String> getInclusivePrefixes(Element target, boolean excludeVisible) {
-        List<String> result = new Vector<String>();
+        List<String> result = new ArrayList<String>();
         Node parent = target;
         while (!(Node.DOCUMENT_NODE == parent.getParentNode().getNodeType())) {
             parent = parent.getParentNode();

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/message/token/Timestamp.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/token/Timestamp.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/message/token/Timestamp.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/message/token/Timestamp.java Wed Dec  1 12:56:29 2010
@@ -34,10 +34,10 @@ import org.w3c.dom.Text;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.text.DateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
-import java.util.Vector;
 
 /**
  * Timestamp according to SOAP Message Security 1.0,
@@ -64,7 +64,7 @@ public class Timestamp {
     public Timestamp(Element timestampElement) throws WSSecurityException {
 
         element = timestampElement;
-        customElements = new Vector<Element>();
+        customElements = new ArrayList<Element>();
 
         String strCreated = null;
         String strExpires = null;
@@ -133,7 +133,7 @@ public class Timestamp {
      */
     public Timestamp(boolean milliseconds, Document doc, int ttl) {
 
-        customElements = new Vector<Element>();
+        customElements = new ArrayList<Element>();
         element = 
             doc.createElementNS(
                 WSConstants.WSU_NS, WSConstants.WSU_PREFIX + ":" + WSConstants.TIMESTAMP_TOKEN_LN

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/processor/EncryptedKeyProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/processor/EncryptedKeyProcessor.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/processor/EncryptedKeyProcessor.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/processor/EncryptedKeyProcessor.java Wed Dec  1 12:56:29 2010
@@ -53,8 +53,8 @@ import javax.xml.namespace.QName;
 import java.io.IOException;
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 
 public class EncryptedKeyProcessor implements Processor {
     private static Log log = LogFactory.getLog(EncryptedKeyProcessor.class.getName());
@@ -196,7 +196,7 @@ public class EncryptedKeyProcessor imple
             WSSecurityUtil.getDirectChildElement(
                 xencEncryptedKey, "ReferenceList", WSConstants.ENC_NS
             );
-        List<WSDataRef> dataRefs = new Vector<WSDataRef>();
+        List<WSDataRef> dataRefs = new ArrayList<WSDataRef>();
         if (refList != null) {
             for (Node node = refList.getFirstChild();
                 node != null; 

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java Wed Dec  1 12:56:29 2010
@@ -19,8 +19,8 @@
 
 package org.apache.ws.security.processor;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 
 import javax.crypto.SecretKey;
 import javax.security.auth.callback.Callback;
@@ -91,7 +91,7 @@ public class ReferenceListProcessor impl
         Crypto crypto,
         WSDocInfo wdi
     ) throws WSSecurityException {
-        List<WSDataRef> dataRefs = new Vector<WSDataRef>();
+        List<WSDataRef> dataRefs = new ArrayList<WSDataRef>();
         for (Node node = elem.getFirstChild(); 
             node != null; 
             node = node.getNextSibling()

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java Wed Dec  1 12:56:29 2010
@@ -114,7 +114,7 @@ public class SignatureProcessor implemen
             log.debug("Found signature element");
         }
         boolean remove = WSDocInfoStore.store(wsDocInfo);
-        List<WSDataRef> protectedRefs = new java.util.Vector<WSDataRef>();
+        List<WSDataRef> protectedRefs = new java.util.ArrayList<WSDataRef>();
         Principal lastPrincipalFound = null;
         certs = null;
         signatureValue = null;

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/processor/UsernameTokenProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/processor/UsernameTokenProcessor.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/processor/UsernameTokenProcessor.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/processor/UsernameTokenProcessor.java Wed Dec  1 12:56:29 2010
@@ -106,13 +106,15 @@ public class UsernameTokenProcessor impl
             log.debug("UsernameToken password type " + pwType);
         }
         
-        String requiredPasswordType = wssConfig.getRequiredPasswordType();
-        if (requiredPasswordType != null && !requiredPasswordType.equals(pwType)) {
-            if (log.isDebugEnabled()) {
-                log.debug("Authentication failed as the received password type does not " 
-                    + "match the required password type of: " + requiredPasswordType);
+        if (wssConfig != null) {
+            String requiredPasswordType = wssConfig.getRequiredPasswordType();
+            if (requiredPasswordType != null && !requiredPasswordType.equals(pwType)) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Authentication failed as the received password type does not " 
+                        + "match the required password type of: " + requiredPasswordType);
+                }
+                throw new WSSecurityException(WSSecurityException.FAILED_AUTHENTICATION);
             }
-            throw new WSSecurityException(WSSecurityException.FAILED_AUTHENTICATION);
         }
         //
         // If the UsernameToken is hashed or plaintext, then retrieve the password from the

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSecSignatureSAML.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSecSignatureSAML.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSecSignatureSAML.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSecSignatureSAML.java Wed Dec  1 12:56:29 2010
@@ -45,9 +45,9 @@ import org.w3c.dom.Element;
 
 import java.security.PublicKey;
 import java.security.cert.X509Certificate;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Vector;
 
 import javax.xml.crypto.URIDereferencer;
 import javax.xml.crypto.XMLStructure;
@@ -119,7 +119,7 @@ public class WSSecSignatureSAML extends 
 
         String soapNamespace = WSSecurityUtil.getSOAPNamespace(doc.getDocumentElement());
         if (parts == null) {
-            parts = new Vector<WSEncryptionPart>();
+            parts = new ArrayList<WSEncryptionPart>();
             WSEncryptionPart encP = 
                 new WSEncryptionPart(WSConstants.ELEM_BODY, soapNamespace, "Content");
             parts.add(encP);

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java Wed Dec  1 12:56:29 2010
@@ -47,9 +47,9 @@ import javax.xml.namespace.QName;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Vector;
 
 /**
  * WS-Security Utility methods. <p/>
@@ -186,7 +186,7 @@ public class WSSecurityUtil {
         String localName,
         String namespace
     ) {
-        List<Node> children = new Vector<Node>();
+        List<Node> children = new ArrayList<Node>();
         for (
             Node currentChild = fNode.getFirstChild(); 
             currentChild != null; 
@@ -1151,7 +1151,7 @@ public class WSSecurityUtil {
     listChildren(
         final Node parent
     ) {
-        final List<Node> ret = new Vector<Node>();
+        final List<Node> ret = new ArrayList<Node>();
         if (parent != null) {
             Node node = parent.getFirstChild();
             while (node != null) {
@@ -1173,7 +1173,7 @@ public class WSSecurityUtil {
         if (a.size() == 0) {
             return b;
         }
-        final List<Node> ret = new Vector<Node>();
+        final List<Node> ret = new ArrayList<Node>();
         if (b.size() == 0) {
             return ret;
         }

Modified: webservices/wss4j/trunk/test/wssec/PasswordTypeTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/PasswordTypeTest.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/PasswordTypeTest.java (original)
+++ webservices/wss4j/trunk/test/wssec/PasswordTypeTest.java Wed Dec  1 12:56:29 2010
@@ -190,7 +190,7 @@ public class PasswordTypeTest extends Te
         reqData.setUsername("wernerd");
         reqData.setMsgContext(config);
         
-        java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.UT));
         
         handler.send(WSConstants.UT, doc, reqData, actions, true);

Modified: webservices/wss4j/trunk/test/wssec/SignatureConfirmationTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/SignatureConfirmationTest.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/SignatureConfirmationTest.java (original)
+++ webservices/wss4j/trunk/test/wssec/SignatureConfirmationTest.java Wed Dec  1 12:56:29 2010
@@ -39,7 +39,7 @@ import org.w3c.dom.Document;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Vector;
+import java.util.ArrayList;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
@@ -100,7 +100,7 @@ public class SignatureConfirmationTest e
         reqData.setMsgContext(msgContext);
         reqData.setUsername("16c73ab6-b892-458f-abf5-2f875f74882e");
         
-        final java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        final java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.SIGN));
         final Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
         MyHandler handler = new MyHandler();
@@ -138,7 +138,7 @@ public class SignatureConfirmationTest e
         reqData.setMsgContext(msgContext);
         reqData.setUsername("16c73ab6-b892-458f-abf5-2f875f74882e");
         
-        final java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        final java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.SIGN));
         final Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
         MyHandler handler = new MyHandler();
@@ -174,7 +174,7 @@ public class SignatureConfirmationTest e
         reqData.setMsgContext(msgContext);
         reqData.setUsername("16c73ab6-b892-458f-abf5-2f875f74882e");
         
-        final java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        final java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.SIGN));
         Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
         MyHandler handler = new MyHandler();
@@ -203,7 +203,7 @@ public class SignatureConfirmationTest e
         doc = SOAPUtil.toSOAPPart(SOAPMSG);
         msgContext = (java.util.Map<String, Object>)reqData.getMsgContext();
         WSHandlerResult handlerResult = new WSHandlerResult(null, results);
-        List<WSHandlerResult> receivedResults = new Vector<WSHandlerResult>();
+        List<WSHandlerResult> receivedResults = new ArrayList<WSHandlerResult>();
         receivedResults.add(handlerResult);
         msgContext.put(WSHandlerConstants.RECV_RESULTS, receivedResults);
         handler.send(
@@ -234,7 +234,7 @@ public class SignatureConfirmationTest e
         reqData.setMsgContext(msgContext);
         reqData.setUsername("16c73ab6-b892-458f-abf5-2f875f74882e");
         
-        final java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        final java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.SIGN));
         Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
         MyHandler handler = new MyHandler();
@@ -256,7 +256,7 @@ public class SignatureConfirmationTest e
         doc = SOAPUtil.toSOAPPart(SOAPMSG);
         msgContext = (java.util.Map<String, Object>)reqData.getMsgContext();
         WSHandlerResult handlerResult = new WSHandlerResult(null, results);
-        List<WSHandlerResult> receivedResults = new Vector<WSHandlerResult>();
+        List<WSHandlerResult> receivedResults = new ArrayList<WSHandlerResult>();
         receivedResults.add(handlerResult);
         msgContext.put(WSHandlerConstants.RECV_RESULTS, receivedResults);
         handler.send(

Modified: webservices/wss4j/trunk/test/wssec/TestModifiedRequest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestModifiedRequest.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestModifiedRequest.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestModifiedRequest.java Wed Dec  1 12:56:29 2010
@@ -41,7 +41,7 @@ import javax.security.auth.callback.Call
 import javax.security.auth.callback.UnsupportedCallbackException;
 import java.io.IOException;
 import java.util.List;
-import java.util.Vector;
+import java.util.ArrayList;
 
 /**
  * This class tests the modification of requests to see if signature verification fails.
@@ -98,7 +98,7 @@ public class TestModifiedRequest extends
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
         
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         WSEncryptionPart encP =
             new WSEncryptionPart(
                 "value",
@@ -151,7 +151,7 @@ public class TestModifiedRequest extends
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
         
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         WSEncryptionPart encP =
             new WSEncryptionPart(
                 "value",

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityDataRef.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityDataRef.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityDataRef.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityDataRef.java Wed Dec  1 12:56:29 2010
@@ -21,7 +21,7 @@ package wssec;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Vector;
+import java.util.ArrayList;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
@@ -120,7 +120,7 @@ public class TestWSSecurityDataRef exten
         /*
          * Set up the parts structure to encrypt the body
          */
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         WSEncryptionPart encP = new WSEncryptionPart("testMethod", "uri:LogTestService2",
                 "Element");
         parts.add(encP);

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityDataRef1.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityDataRef1.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityDataRef1.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityDataRef1.java Wed Dec  1 12:56:29 2010
@@ -21,7 +21,7 @@ package wssec;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Vector;
+import java.util.ArrayList;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
@@ -121,7 +121,7 @@ public class TestWSSecurityDataRef1 exte
         /*
          * Set up the parts structure to encrypt the body
          */
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         WSEncryptionPart encP = new WSEncryptionPart("testMethod", "uri:LogTestService2",
                 "Element");
         parts.add(encP);

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityEncryptionParts.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityEncryptionParts.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityEncryptionParts.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityEncryptionParts.java Wed Dec  1 12:56:29 2010
@@ -46,7 +46,7 @@ import javax.xml.namespace.QName;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Vector;
+import java.util.ArrayList;
 
 /**
  * This is some unit tests for encryption using encryption using parts. Note that the "soapMsg" below
@@ -101,7 +101,7 @@ public class TestWSSecurityEncryptionPar
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
         
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         WSEncryptionPart encP =
             new WSEncryptionPart(
                 "foobar",
@@ -167,7 +167,7 @@ public class TestWSSecurityEncryptionPar
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
         
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         WSEncryptionPart encP =
             new WSEncryptionPart(
                 "foobar",
@@ -216,7 +216,7 @@ public class TestWSSecurityEncryptionPar
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
         
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         WSEncryptionPart encP =
             new WSEncryptionPart(
                 "foobar2",
@@ -247,7 +247,7 @@ public class TestWSSecurityEncryptionPar
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
         
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         WSEncryptionPart encP =
             new WSEncryptionPart(
                 "foobar",
@@ -279,7 +279,7 @@ public class TestWSSecurityEncryptionPar
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
         
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         WSEncryptionPart encP =
             new WSEncryptionPart(
                 soapConstants.getBodyQName().getLocalPart(),    // define the body

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityGetPassword.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityGetPassword.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityGetPassword.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityGetPassword.java Wed Dec  1 12:56:29 2010
@@ -123,7 +123,7 @@ public class TestWSSecurityGetPassword e
         messageContext.put("password", "securityPassword");
         reqData.setMsgContext(messageContext);
         
-        final java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        final java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.UT));
         Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
         MyHandler handler = new MyHandler();
@@ -164,7 +164,7 @@ public class TestWSSecurityGetPassword e
         );
         reqData.setMsgContext(messageContext);
         
-        final java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        final java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.UT));
         Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
         MyHandler handler = new MyHandler();

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityKerberosTokenProfile.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityKerberosTokenProfile.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityKerberosTokenProfile.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityKerberosTokenProfile.java Wed Dec  1 12:56:29 2010
@@ -42,7 +42,7 @@ import javax.security.auth.callback.Call
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
 import java.io.IOException;
-import java.util.Vector;
+import java.util.ArrayList;
 
 /**
  * This is a test for the Kerberos Token Profile 1.1
@@ -139,7 +139,7 @@ public class TestWSSecurityKerberosToken
         sign.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
         sign.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
         
-        java.util.List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        java.util.List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         WSEncryptionPart encP =
             new WSEncryptionPart(bst.getID());
         parts.add(encP);
@@ -181,7 +181,7 @@ public class TestWSSecurityKerberosToken
         sign.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
         sign.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
         
-        java.util.List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        java.util.List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         parts.add(new WSEncryptionPart(bst.getID()));
         parts.add(new WSEncryptionPart(timestamp.getId()));
         sign.setParts(parts);

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java Wed Dec  1 12:56:29 2010
@@ -37,7 +37,7 @@ import org.apache.ws.security.message.WS
 import org.w3c.dom.Document;
 
 import java.util.List;
-import java.util.Vector;
+import java.util.ArrayList;
 
 /**
  * WS-Security Test Case
@@ -98,7 +98,7 @@ public class TestWSSecurityNew11 extends
         builder.setUserInfo("wss40", "security");
         Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
         SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(doc.getDocumentElement());
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         
         //
         // Set up to sign body and use STRTransform to sign
@@ -147,7 +147,7 @@ public class TestWSSecurityNew11 extends
         builder.setUserInfo("wss40", "security");
         Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
         SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(doc.getDocumentElement());
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
@@ -206,7 +206,7 @@ public class TestWSSecurityNew11 extends
         
         Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
         SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(doc.getDocumentElement());
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         
         //
         // Set up to sign body and use STRTransform to sign
@@ -259,7 +259,7 @@ public class TestWSSecurityNew11 extends
         builder.setUserInfo("wss40", "security");
         Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
         SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(doc.getDocumentElement());
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         
         //
         // Set up to sign body and use STRTransform to sign

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew13.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew13.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew13.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew13.java Wed Dec  1 12:56:29 2010
@@ -198,7 +198,7 @@ public class TestWSSecurityNew13 extends
         reqData.setUsername("wernerd");
         reqData.setMsgContext(config);
         
-        java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.UT_SIGN));
         
         handler.send(WSConstants.UT_SIGN, doc, reqData, actions, true);

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java Wed Dec  1 12:56:29 2010
@@ -301,7 +301,7 @@ public class TestWSSecurityNew14 extends
         reqData.setMsgContext(messageContext);
         reqData.setUsername("");
         
-        final java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        final java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.ENCR));
         final Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
         MyHandler handler = new MyHandler();

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew15.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew15.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew15.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew15.java Wed Dec  1 12:56:29 2010
@@ -42,7 +42,7 @@ import javax.security.auth.callback.Call
 import javax.security.auth.callback.UnsupportedCallbackException;
 import java.io.IOException;
 
-import java.util.Vector;
+import java.util.ArrayList;
 
 /**
  * Test that encrypt and decrypt a WS-Security envelope.
@@ -127,7 +127,7 @@ public class TestWSSecurityNew15 extends
          */
         SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(doc
                 .getDocumentElement());
-        java.util.List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        java.util.List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         WSEncryptionPart encP = new WSEncryptionPart(soapConstants
                 .getBodyQName().getLocalPart(), soapConstants.getEnvelopeURI(),
                 "Content");

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew17.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew17.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew17.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew17.java Wed Dec  1 12:56:29 2010
@@ -230,7 +230,7 @@ public class TestWSSecurityNew17 extends
         reqData.setMsgContext(messageContext);
         reqData.setUsername("");
         
-        final java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        final java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.SIGN));
         final Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
         MyHandler handler = new MyHandler();

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew18.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew18.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew18.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew18.java Wed Dec  1 12:56:29 2010
@@ -183,7 +183,7 @@ public class TestWSSecurityNew18 extends
         );
         reqData.setMsgContext(config);
         
-        final java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        final java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(action));
         final Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
         MyHandler handler = new MyHandler();

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java Wed Dec  1 12:56:29 2010
@@ -41,7 +41,7 @@ import javax.security.auth.callback.Call
 import javax.security.auth.callback.UnsupportedCallbackException;
 import java.io.IOException;
 
-import java.util.Vector;
+import java.util.ArrayList;
 
 /**
  * WS-Security Test Case
@@ -127,7 +127,7 @@ public class TestWSSecurityNew2 extends 
          */
         builder.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
         builder.setSymmetricEncAlgorithm(WSConstants.AES_128);
-        java.util.List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        java.util.List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         WSEncryptionPart encP =
             new WSEncryptionPart("testMethod", "uri:LogTestService2", "Element");
         parts.add(encP);

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew3.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew3.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew3.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew3.java Wed Dec  1 12:56:29 2010
@@ -41,7 +41,7 @@ import javax.security.auth.callback.Call
 import javax.security.auth.callback.UnsupportedCallbackException;
 import java.io.IOException;
 import java.util.List;
-import java.util.Vector;
+import java.util.ArrayList;
 
 /**
  * WS-Security Test Case
@@ -268,7 +268,7 @@ public class TestWSSecurityNew3 extends 
         timestamp.setTimeToLive(300);
         Document createdDoc = timestamp.build(doc, secHeader);
         
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         WSEncryptionPart encP =
             new WSEncryptionPart(
                 "Timestamp",

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew5.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew5.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew5.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew5.java Wed Dec  1 12:56:29 2010
@@ -647,7 +647,7 @@ public class TestWSSecurityNew5 extends 
         reqData.setUsername("wernerd");
         reqData.setMsgContext(config);
         
-        java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.UT));
         
         handler.send(WSConstants.UT, doc, reqData, actions, true);
@@ -674,7 +674,7 @@ public class TestWSSecurityNew5 extends 
         reqData.setUsername("emptyuser");
         reqData.setMsgContext(config);
         
-        java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.UT));
         
         handler.send(WSConstants.UT, doc, reqData, actions, true);

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew6.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew6.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew6.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew6.java Wed Dec  1 12:56:29 2010
@@ -43,7 +43,7 @@ import javax.security.auth.callback.Call
 import javax.security.auth.callback.UnsupportedCallbackException;
 import java.io.IOException;
 import java.util.List;
-import java.util.Vector;
+import java.util.ArrayList;
 
 /**
  * WS-Security Test Case <p/>
@@ -148,7 +148,7 @@ public class TestWSSecurityNew6 extends 
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
 
-        List<WSEncryptionPart> encParts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> encParts = new ArrayList<WSEncryptionPart>();
         encParts.add(
                 new WSEncryptionPart(
                         "add",
@@ -165,7 +165,7 @@ public class TestWSSecurityNew6 extends 
             LOG.debug(outputString);
         }
         
-        List<WSEncryptionPart> sigParts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> sigParts = new ArrayList<WSEncryptionPart>();
         sigParts.add(
                 new WSEncryptionPart(
                         WSConstants.ENC_DATA_LN,
@@ -184,10 +184,10 @@ public class TestWSSecurityNew6 extends 
         
         List<WSSecurityEngineResult> results = verify(encryptedSignedDoc);
         
-        List<WSSecurityEngineResult> sigSecEngResults = new Vector<WSSecurityEngineResult>();
+        List<WSSecurityEngineResult> sigSecEngResults = new ArrayList<WSSecurityEngineResult>();
         WSSecurityUtil.fetchAllActionResults(results, WSConstants.SIGN, sigSecEngResults);
         
-        List<WSSecurityEngineResult> encSecEngResults = new Vector<WSSecurityEngineResult>();
+        List<WSSecurityEngineResult> encSecEngResults = new ArrayList<WSSecurityEngineResult>();
         WSSecurityUtil.fetchAllActionResults(results, WSConstants.ENCR, encSecEngResults);
         
         assertEquals(1, sigSecEngResults.size());
@@ -255,7 +255,7 @@ public class TestWSSecurityNew6 extends 
         LOG.info("Before Encryption....");
         Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
         
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         WSEncryptionPart encP =
             new WSEncryptionPart(
                 "add",

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityResultsOrder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityResultsOrder.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityResultsOrder.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityResultsOrder.java Wed Dec  1 12:56:29 2010
@@ -58,7 +58,7 @@ public class TestWSSecurityResultsOrder 
     testOrder() throws Exception {
         MyHandler handler = new MyHandler();
         
-        java.util.List<WSSecurityEngineResult> results = new java.util.Vector<WSSecurityEngineResult>();
+        java.util.List<WSSecurityEngineResult> results = new java.util.ArrayList<WSSecurityEngineResult>();
         results.add(
             new WSSecurityEngineResult(WSConstants.UT, (Object)null)
         );
@@ -72,7 +72,7 @@ public class TestWSSecurityResultsOrder 
             new WSSecurityEngineResult(WSConstants.SIGN, (Object)null)
         );
         
-        java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.UT));
         actions.add(new Integer(WSConstants.TS));
         actions.add(new Integer(WSConstants.SIGN));
@@ -87,7 +87,7 @@ public class TestWSSecurityResultsOrder 
     testReverseOrder() throws Exception {
         MyHandler handler = new MyHandler();
         
-        java.util.List<WSSecurityEngineResult> results = new java.util.Vector<WSSecurityEngineResult>();
+        java.util.List<WSSecurityEngineResult> results = new java.util.ArrayList<WSSecurityEngineResult>();
         results.add(
             new WSSecurityEngineResult(WSConstants.SIGN, (Object)null)
         );
@@ -101,7 +101,7 @@ public class TestWSSecurityResultsOrder 
             new WSSecurityEngineResult(WSConstants.UT, (Object)null)
         );
         
-        java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.UT));
         actions.add(new Integer(WSConstants.TS));
         actions.add(new Integer(WSConstants.SIGN));
@@ -118,7 +118,7 @@ public class TestWSSecurityResultsOrder 
         MyHandler handler = new MyHandler();
         
         java.util.List<WSSecurityEngineResult> results = 
-            new java.util.Vector<WSSecurityEngineResult>();
+            new java.util.ArrayList<WSSecurityEngineResult>();
         results.add(
             new WSSecurityEngineResult(WSConstants.TS, (Object)null)
         );
@@ -132,7 +132,7 @@ public class TestWSSecurityResultsOrder 
             new WSSecurityEngineResult(WSConstants.UT, (Object)null)
         );
         
-        java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.UT));
         actions.add(new Integer(WSConstants.TS));
         actions.add(new Integer(WSConstants.SIGN));
@@ -149,7 +149,7 @@ public class TestWSSecurityResultsOrder 
         MyHandler handler = new MyHandler();
         
         java.util.List<WSSecurityEngineResult> results = 
-            new java.util.Vector<WSSecurityEngineResult>();
+            new java.util.ArrayList<WSSecurityEngineResult>();
         results.add(
             new WSSecurityEngineResult(WSConstants.TS, (Object)null)
         );
@@ -163,7 +163,7 @@ public class TestWSSecurityResultsOrder 
             new WSSecurityEngineResult(WSConstants.UT, (Object)null)
         );
         
-        java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.SIGN));
         actions.add(new Integer(WSConstants.UT));
         actions.add(new Integer(WSConstants.TS));
@@ -179,7 +179,7 @@ public class TestWSSecurityResultsOrder 
         MyHandler handler = new MyHandler();
         
         java.util.List<WSSecurityEngineResult> results = 
-            new java.util.Vector<WSSecurityEngineResult>();
+            new java.util.ArrayList<WSSecurityEngineResult>();
         results.add(
             new WSSecurityEngineResult(WSConstants.UT, (Object)null)
         );
@@ -190,7 +190,7 @@ public class TestWSSecurityResultsOrder 
             new WSSecurityEngineResult(WSConstants.SC, (Object)null)
         );
         
-        java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.TS));
         actions.add(new Integer(WSConstants.UT));
         actions.add(new Integer(WSConstants.SIGN));
@@ -206,7 +206,7 @@ public class TestWSSecurityResultsOrder 
         MyHandler handler = new MyHandler();
         
         java.util.List<WSSecurityEngineResult> results = 
-            new java.util.Vector<WSSecurityEngineResult>();
+            new java.util.ArrayList<WSSecurityEngineResult>();
         results.add(
             new WSSecurityEngineResult(WSConstants.UT, (Object)null)
         );
@@ -220,7 +220,7 @@ public class TestWSSecurityResultsOrder 
             new WSSecurityEngineResult(WSConstants.SC, (Object)null)
         );
         
-        java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.TS));
         actions.add(new Integer(WSConstants.UT));
         
@@ -235,9 +235,9 @@ public class TestWSSecurityResultsOrder 
         MyHandler handler = new MyHandler();
         
         java.util.List<WSSecurityEngineResult> results = 
-            new java.util.Vector<WSSecurityEngineResult>();
+            new java.util.ArrayList<WSSecurityEngineResult>();
         
-        java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.TS));
         
         assertFalse (handler.checkResults(results, actions));
@@ -251,12 +251,12 @@ public class TestWSSecurityResultsOrder 
         MyHandler handler = new MyHandler();
         
         java.util.List<WSSecurityEngineResult> results = 
-            new java.util.Vector<WSSecurityEngineResult>();
+            new java.util.ArrayList<WSSecurityEngineResult>();
         results.add(
             new WSSecurityEngineResult(WSConstants.TS, (Object)null)
         );
         
-        java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         
         assertFalse (handler.checkResults(results, actions));
         assertFalse (handler.checkResultsAnyOrder(results, actions));
@@ -269,7 +269,7 @@ public class TestWSSecurityResultsOrder 
         MyHandler handler = new MyHandler();
         
         java.util.List<WSSecurityEngineResult> results = 
-            new java.util.Vector<WSSecurityEngineResult>();
+            new java.util.ArrayList<WSSecurityEngineResult>();
         results.add(
             new WSSecurityEngineResult(WSConstants.ENCR, (Object)null)
         );
@@ -280,7 +280,7 @@ public class TestWSSecurityResultsOrder 
             new WSSecurityEngineResult(WSConstants.ENCR, (Object)null)
         );
         
-        java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.ENCR));
         actions.add(new Integer(WSConstants.UT));
         actions.add(new Integer(WSConstants.UT));

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecuritySAMLKeyIdentifier.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecuritySAMLKeyIdentifier.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecuritySAMLKeyIdentifier.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecuritySAMLKeyIdentifier.java Wed Dec  1 12:56:29 2010
@@ -53,7 +53,7 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
-import java.util.Vector;
+import java.util.ArrayList;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
@@ -153,7 +153,7 @@ public class TestWSSecuritySAMLKeyIdenti
         builder.setCustomEKTokenId(assertion.getId());
         
         builder.prepare(doc, hokCrypto);
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         WSEncryptionPart encP = new WSEncryptionPart("testMethod", "uri:LogTestService2", "Element");
         parts.add(encP);
         Element refElement = builder.encryptForRef(null, parts);

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecuritySignatureParts.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecuritySignatureParts.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecuritySignatureParts.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecuritySignatureParts.java Wed Dec  1 12:56:29 2010
@@ -48,7 +48,7 @@ import javax.security.auth.callback.Call
 import javax.security.auth.callback.UnsupportedCallbackException;
 import java.io.IOException;
 import java.util.List;
-import java.util.Vector;
+import java.util.ArrayList;
 import javax.xml.namespace.QName;
 
 /**
@@ -104,7 +104,7 @@ public class TestWSSecuritySignaturePart
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
         
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         WSEncryptionPart encP =
             new WSEncryptionPart(
                 "foobar",
@@ -184,7 +184,7 @@ public class TestWSSecuritySignaturePart
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
         
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         WSEncryptionPart encP =
             new WSEncryptionPart("STRTransform", "", "Element");
         parts.add(encP);
@@ -237,7 +237,7 @@ public class TestWSSecuritySignaturePart
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
         
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         WSEncryptionPart encP =
             new WSEncryptionPart(
                 "foobar2",
@@ -267,7 +267,7 @@ public class TestWSSecuritySignaturePart
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
         
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         WSEncryptionPart encP =
             new WSEncryptionPart(
                 "foobar",
@@ -299,7 +299,7 @@ public class TestWSSecuritySignaturePart
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
         
-        List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
         WSEncryptionPart encP =
             new WSEncryptionPart(
                 soapConstants.getBodyQName().getLocalPart(),    // define the body

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityUTSignature.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityUTSignature.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityUTSignature.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityUTSignature.java Wed Dec  1 12:56:29 2010
@@ -189,7 +189,7 @@ public class TestWSSecurityUTSignature e
         reqData.setMsgContext(messageContext);
         reqData.setUsername("bob");
         
-        final java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        final java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.UT_SIGN));
         
         Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
@@ -235,7 +235,7 @@ public class TestWSSecurityUTSignature e
         reqData.setMsgContext(messageContext);
         reqData.setUsername("bob");
         
-        final java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        final java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.UT_SIGN));
         
         Document doc = SOAPUtil.toSOAPPart(SOAPMSG);

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityUserProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityUserProcessor.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityUserProcessor.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityUserProcessor.java Wed Dec  1 12:56:29 2010
@@ -39,7 +39,7 @@ import org.apache.ws.security.util.WSSec
 import org.w3c.dom.Document;
 
 import java.util.List;
-import java.util.Vector;
+import java.util.ArrayList;
 
 
 /**
@@ -190,7 +190,7 @@ public class TestWSSecurityUserProcessor
         final RequestData reqData = new RequestData();
         reqData.setWssConfig(cfg);
         
-        final List<Integer> actions = new Vector<Integer>();
+        final List<Integer> actions = new ArrayList<Integer>();
         actions.add(new Integer(action));
         final Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
         MyHandler handler = new MyHandler();
@@ -219,7 +219,7 @@ public class TestWSSecurityUserProcessor
         final RequestData reqData = new RequestData();
         reqData.setWssConfig(cfg);
         
-        final List<Integer> actions = new Vector<Integer>();
+        final List<Integer> actions = new ArrayList<Integer>();
         actions.add(new Integer(action));
         final Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
         MyHandler handler = new MyHandler();
@@ -247,7 +247,7 @@ public class TestWSSecurityUserProcessor
         
         String actionString = 
             WSHandlerConstants.TIMESTAMP + " " + new Integer(customAction).toString();
-        List<Integer> actionList = new Vector<Integer>();
+        List<Integer> actionList = new ArrayList<Integer>();
         //
         // This parsing will fail as it doesn't know what the custom action is
         //

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS194.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS194.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS194.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS194.java Wed Dec  1 12:56:29 2010
@@ -110,7 +110,7 @@ public class TestWSSecurityWSS194 extend
         messageContext.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
         reqData.setMsgContext(messageContext);
         
-        final java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        final java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.UT));
         actions.add(new Integer(WSConstants.SIGN));
         final Document doc = SOAPUtil.toSOAPPart(SOAPMSG);

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS245.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS245.java?rev=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS245.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS245.java Wed Dec  1 12:56:29 2010
@@ -99,7 +99,7 @@ public class TestWSSecurityWSS245 extend
         );
         reqData.setMsgContext(messageContext);
         
-        final java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        final java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(WSConstants.UT));
         Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
         MyHandler handler = new MyHandler();
@@ -135,7 +135,7 @@ public class TestWSSecurityWSS245 extend
         reqData.setPwType(WSConstants.PASSWORD_TEXT);
         reqData.setMsgContext(new java.util.TreeMap<String, String>());
         
-        final java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        final java.util.List<Integer> actions = new java.util.ArrayList<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=1040987&r1=1040986&r2=1040987&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS40.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS40.java Wed Dec  1 12:56:29 2010
@@ -292,7 +292,7 @@ public class TestWSSecurityWSS40 extends
         config.put(WSHandlerConstants.USE_SINGLE_CERTIFICATE, "false");
         reqData.setMsgContext(config);
         
-        final java.util.List<Integer> actions = new java.util.Vector<Integer>();
+        final java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
         actions.add(new Integer(action));
         final Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
         MyHandler handler = new MyHandler();



Mime
View raw message