amattheu 2003/08/28 06:13:43
Modified: src/org/apache/xml/security/encryption EncryptedKey.java
ReferenceList.java XMLCipher.java
src/org/apache/xml/security Init.java
src/org/apache/xml/security/algorithms/encryption/helper
OAEPCipher.java TripleDESWrapper.java
Log:
Code clean up.
Revision Changes Path
1.9 +0 -2
xml-security/src/org/apache/xml/security/encryption/EncryptedKey.java
Index: EncryptedKey.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/encryption/EncryptedKey.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- EncryptedKey.java 18 Mar 2003 22:47:44 -0000 1.8
+++ EncryptedKey.java 28 Aug 2003 13:13:43 -0000 1.9
@@ -59,8 +59,6 @@
package org.apache.xml.security.encryption;
-import java.util.Iterator;
-
/**
* The <code>EncryptedKey</code> element is used to transport encryption keys
1.8 +1 -1
xml-security/src/org/apache/xml/security/encryption/ReferenceList.java
Index: ReferenceList.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/encryption/ReferenceList.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ReferenceList.java 18 Mar 2003 22:51:23 -0000 1.7
+++ ReferenceList.java 28 Aug 2003 13:13:43 -0000 1.8
@@ -193,7 +193,7 @@
private List referenceInformation;
ReferenceImpl(String uri) {
- uri = uri;
+ this.uri = uri;
referenceInformation = new LinkedList();
}
1.5 +0 -13
xml-security/src/org/apache/xml/security/encryption/XMLCipher.java
Index: XMLCipher.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/encryption/XMLCipher.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLCipher.java 21 Jul 2003 11:30:40 -0000 1.4
+++ XMLCipher.java 28 Aug 2003 13:13:43 -0000 1.5
@@ -68,7 +68,6 @@
import java.security.InvalidAlgorithmParameterException;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
-import java.security.Provider;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
@@ -82,15 +81,6 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
import org.apache.xml.security.keys.KeyInfo;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.EncryptionConstants;
@@ -104,10 +94,8 @@
import org.apache.xml.serialize.OutputFormat;
import org.apache.xml.serialize.XMLSerializer;
import org.apache.xml.utils.URI;
-import org.apache.xml.utils.URI.MalformedURIException;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.DOMException;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -115,7 +103,6 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import sun.misc.BASE64Encoder;
-import sun.misc.BASE64Decoder;
import org.apache.xml.security.utils.Base64;
1.21 +3 -4 xml-security/src/org/apache/xml/security/Init.java
Index: Init.java
===================================================================
RCS file: /home/cvs/xml-security/src/org/apache/xml/security/Init.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Init.java 1 May 2003 18:20:25 -0000 1.20
+++ Init.java 28 Aug 2003 13:13:43 -0000 1.21
@@ -73,7 +73,6 @@
import org.apache.xml.security.keys.keyresolver.KeyResolver;
import org.apache.xml.security.transforms.Transform;
import org.apache.xml.security.transforms.implementations.FuncHere;
-import org.apache.xml.security.transforms.params.XPathContainer;
import org.apache.xml.security.utils.*;
import org.apache.xml.security.utils.resolver.ResourceResolver;
import org.apache.xpath.XPathAPI;
1.5 +1 -2
xml-security/src/org/apache/xml/security/algorithms/encryption/helper/OAEPCipher.java
Index: OAEPCipher.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/algorithms/encryption/helper/OAEPCipher.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OAEPCipher.java 29 Apr 2003 21:36:53 -0000 1.4
+++ OAEPCipher.java 28 Aug 2003 13:13:43 -0000 1.5
@@ -66,7 +66,6 @@
import java.security.MessageDigest;
import java.security.PrivateKey;
import java.security.SecureRandom;
-import java.security.Security;
import java.security.spec.KeySpec;
import java.security.spec.RSAPrivateKeySpec;
1.5 +1 -3
xml-security/src/org/apache/xml/security/algorithms/encryption/helper/TripleDESWrapper.java
Index: TripleDESWrapper.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/algorithms/encryption/helper/TripleDESWrapper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TripleDESWrapper.java 11 Feb 2003 16:02:46 -0000 1.4
+++ TripleDESWrapper.java 28 Aug 2003 13:13:43 -0000 1.5
@@ -352,8 +352,6 @@
return result;
} catch (InvalidCipherTextException ex) {
throw ex;
- } catch (XMLSecurityException ex) {
- throw ex;
} catch (Exception ex) {
throw new XMLSecurityException("empty", ex);
}
