You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by ra...@apache.org on 2005/05/15 13:51:43 UTC
cvs commit: xml-security/src/org/apache/xml/security/utils/resolver ResourceResolver.java
raul 2005/05/15 04:51:43
Modified: src/org/apache/xml/security/signature Manifest.java
src/org/apache/xml/security/keys/storage/implementations
CertsInFilesystemDirectoryResolver.java
src/org/apache/xml/security/keys/keyresolver
KeyResolver.java
src/org/apache/xml/security/utils/resolver
ResourceResolver.java
Log:
Change all Vector to List(ArrayList), we don't need synchronization safety.
Revision Changes Path
1.34 +11 -10 xml-security/src/org/apache/xml/security/signature/Manifest.java
Index: Manifest.java
===================================================================
RCS file: /home/cvs/xml-security/src/org/apache/xml/security/signature/Manifest.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Manifest.java 13 Feb 2005 12:05:17 -0000 1.33
+++ Manifest.java 15 May 2005 11:51:43 -0000 1.34
@@ -19,10 +19,11 @@
import java.io.IOException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Set;
-import java.util.Vector;
import javax.xml.parsers.ParserConfigurationException;
@@ -57,20 +58,20 @@
org.apache.commons.logging.LogFactory.getLog(Manifest.class.getName());
/** Field _references */
- Vector _references;
+ List _references;
Element[] _referencesEl;
/** Field verificationResults[] */
private boolean verificationResults[] = null;
/** Field _signedContents */
- Vector _signedContents = new Vector();
+ List _signedContents = new ArrayList();
/** Field _resolverProperties */
HashMap _resolverProperties = new HashMap(10);
/** Field _perManifestResolvers */
- Vector _perManifestResolvers = new Vector();
+ List _perManifestResolvers = new ArrayList();
//CachedXPathAPIHolder cx=new CachedXPathAPIHolder();
/**
@@ -84,7 +85,7 @@
XMLUtils.addReturnToElement(this._constructionElement);
- this._references = new Vector();
+ this._references = new ArrayList();
}
/**
@@ -116,7 +117,7 @@
}
// create Vector
- this._references = new Vector(le);
+ this._references = new ArrayList(le);
for (int i = 0; i < le; i++) {
this._references.add(null);
@@ -178,7 +179,7 @@
for (int i = 0; i < this.getLength(); i++) {
// update the cached Reference object, the Element content is automatically updated
- Reference currentRef = (Reference) this._references.elementAt(i);
+ Reference currentRef = (Reference) this._references.get(i);
currentRef.generateDigestValue();
}
@@ -207,9 +208,9 @@
if (this._state == MODE_SIGN) {
// we already have real objects
- return (Reference) this._references.elementAt(i);
+ return (Reference) this._references.get(i);
}
- if (this._references.elementAt(i) == null) {
+ if (this._references.get(i) == null) {
// not yet constructed, so _we_ have to
Reference ref = new Reference(_referencesEl[i], this._baseURI, this);
@@ -217,7 +218,7 @@
this._references.set(i, ref);
}
- return (Reference) this._references.elementAt(i);
+ return (Reference) this._references.get(i);
}
1.9 +6 -6 xml-security/src/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
Index: CertsInFilesystemDirectoryResolver.java
===================================================================
RCS file: /home/cvs/xml-security/src/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CertsInFilesystemDirectoryResolver.java 25 Sep 2004 19:42:23 -0000 1.8
+++ CertsInFilesystemDirectoryResolver.java 15 May 2005 11:51:43 -0000 1.9
@@ -30,7 +30,7 @@
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Iterator;
-import java.util.Vector;
+import java.util.List;
import org.apache.xml.security.keys.storage.StorageResolverException;
import org.apache.xml.security.keys.storage.StorageResolverSpi;
@@ -54,7 +54,7 @@
String _merlinsCertificatesDir = null;
/** Field _certs */
- private Vector _certs = new Vector();
+ private List _certs = new ArrayList();
/** Field _iterator */
Iterator _iterator = null;
@@ -159,7 +159,7 @@
class FilesystemIterator implements Iterator {
/** Field _certs */
- Vector _certs = null;
+ List _certs = null;
/** Field _i */
int _i;
@@ -169,7 +169,7 @@
*
* @param certs
*/
- public FilesystemIterator(Vector certs) {
+ public FilesystemIterator(List certs) {
this._certs = certs;
this._i = 0;
}
@@ -181,7 +181,7 @@
/** @inheritDoc */
public Object next() {
- return this._certs.elementAt(this._i++);
+ return this._certs.get(this._i++);
}
/**
1.13 +2 -2 xml-security/src/org/apache/xml/security/keys/keyresolver/KeyResolver.java
Index: KeyResolver.java
===================================================================
RCS file: /home/cvs/xml-security/src/org/apache/xml/security/keys/keyresolver/KeyResolver.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- KeyResolver.java 2 Apr 2005 18:43:01 -0000 1.12
+++ KeyResolver.java 15 May 2005 11:51:43 -0000 1.13
@@ -21,8 +21,8 @@
import java.security.PublicKey;
import java.security.cert.X509Certificate;
+import java.util.ArrayList;
import java.util.List;
-import java.util.Vector;
import javax.crypto.SecretKey;
@@ -146,7 +146,7 @@
public static void init() {
if (!KeyResolver._alreadyInitialized) {
- KeyResolver._resolverVector = new Vector(10);
+ KeyResolver._resolverVector = new ArrayList(10);
_alreadyInitialized = true;
}
}
1.13 +2 -3 xml-security/src/org/apache/xml/security/utils/resolver/ResourceResolver.java
Index: ResourceResolver.java
===================================================================
RCS file: /home/cvs/xml-security/src/org/apache/xml/security/utils/resolver/ResourceResolver.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ResourceResolver.java 3 Apr 2005 08:35:48 -0000 1.12
+++ ResourceResolver.java 15 May 2005 11:51:43 -0000 1.13
@@ -22,7 +22,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.Vector;
import org.apache.xml.security.signature.XMLSignatureInput;
import org.w3c.dom.Attr;
@@ -132,7 +131,7 @@
* @throws ResourceResolverException
*/
public static final ResourceResolver getInstance(
- Attr uri, String BaseURI, Vector individualResolvers)
+ Attr uri, String BaseURI, List individualResolvers)
throws ResourceResolverException {
if (log.isDebugEnabled()) {
log.debug("I was asked to create a ResourceResolver and got " + individualResolvers.size());
@@ -144,7 +143,7 @@
if ((individualResolvers != null) && ((size=individualResolvers.size()) > 0)) {
for (int i = 0; i < size; i++) {
ResourceResolver resolver =
- (ResourceResolver) individualResolvers.elementAt(i);
+ (ResourceResolver) individualResolvers.get(i);
if (resolver != null) {
String currentClass = resolver._resolverSpi.getClass().getName();