You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2009/07/14 17:33:23 UTC
svn commit: r793943 [1/2] - in /xml/security/trunk: src/javax/xml/crypto/
src/javax/xml/crypto/dsig/ src/javax/xml/crypto/dsig/keyinfo/
src/javax/xml/crypto/dsig/spec/
src/org/apache/xml/security/c14n/implementations/
src/org/apache/xml/security/except...
Author: coheigea
Date: Tue Jul 14 15:33:19 2009
New Revision: 793943
URL: http://svn.apache.org/viewvc?rev=793943&view=rev
Log:
[47425] - Fix checkstyle problems with source and tests.
Modified:
xml/security/trunk/src/javax/xml/crypto/MarshalException.java
xml/security/trunk/src/javax/xml/crypto/NoSuchMechanismException.java
xml/security/trunk/src/javax/xml/crypto/dsig/Transform.java
xml/security/trunk/src/javax/xml/crypto/dsig/XMLDSigSecurity.java
xml/security/trunk/src/javax/xml/crypto/dsig/XMLSignContext.java
xml/security/trunk/src/javax/xml/crypto/dsig/keyinfo/KeyValue.java
xml/security/trunk/src/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java
xml/security/trunk/src/org/apache/xml/security/c14n/implementations/UtfHelpper.java
xml/security/trunk/src/org/apache/xml/security/exceptions/XMLSecurityRuntimeException.java
xml/security/trunk/src/org/apache/xml/security/keys/content/x509/XMLX509SKI.java
xml/security/trunk/src/org/apache/xml/security/signature/Reference.java
xml/security/trunk/src/org/apache/xml/security/signature/XMLSignature.java
xml/security/trunk/src/org/apache/xml/security/utils/ElementChecker.java
xml/security/trunk/src/org/apache/xml/security/utils/ElementCheckerImpl.java
xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java
xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/ApacheTransform.java
xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java
xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java
xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java
xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java
xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMTransform.java
xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMUtils.java
xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/KeySelectors.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AllTests.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AppA.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AppB.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/C14N11Test.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CanonicalizationMethodTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/ClassLoaderTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/DetachedTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/Driver.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SecureXSLTTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SignaturePropertyTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SignatureValidator.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/TestUtils.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/TransformTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/X509KeySelector.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLObjectTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLSignContextTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLSignatureTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLValidateContextTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/dom/DOMValidateContextTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/KeyInfoFactoryTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/KeyInfoTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/KeyNameTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/KeyValueTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/RetrievalMethodTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/X509DataTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/X509IssuerSerialTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/c14n/implementations/AllTests.java
xml/security/trunk/src_unitTests/org/apache/xml/security/c14n/implementations/UtfHelperTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/AllTests.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/InteropTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/TestUtils.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/algorithms/AllTests.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/algorithms/SignatureAlgorithmTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/c14n/implementations/Bug45961Test.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/c14n/implementations/MockCanonicalizationMethod.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/encryption/EncryptContentTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/external/org/apache/xalan/XPathAPI/AttributeAncestorOrSelfTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/external/org/apache/xalan/XPathAPI/XalanBug1425Test.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/interop/InteropTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/keys/content/x509/XMLX509CertificateTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/keys/content/x509/XMLX509SKITest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/resource/TestVectorResolver.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/signature/AllTests.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/signature/CreateSignatureTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/signature/InvalidKeyTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/signature/NoKeyInfoTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/signature/SignatureTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/signature/X509DataTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/signature/XMLSignatureInputTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/signature/XmlSecTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/transforms/RegisterTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/transforms/SampleTransform.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/transforms/implementations/AllTests.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/transforms/implementations/TransformBase64DecodeTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/transforms/implementations/TransformXSLTTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/transforms/implementations/Xpath2TransformationTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/utils/AllTests.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/utils/IdResolverTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/utils/OldApiTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/utils/resolver/AllTests.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/utils/resolver/ResolverDirectHTTP.java
Modified: xml/security/trunk/src/javax/xml/crypto/MarshalException.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/javax/xml/crypto/MarshalException.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/javax/xml/crypto/MarshalException.java (original)
+++ xml/security/trunk/src/javax/xml/crypto/MarshalException.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,11 +24,8 @@
import java.io.PrintStream;
import java.io.PrintWriter;
-import javax.xml.crypto.dsig.Manifest;
import javax.xml.crypto.dsig.XMLSignature;
import javax.xml.crypto.dsig.XMLSignatureFactory;
-import javax.xml.crypto.dsig.keyinfo.KeyInfo;
-import javax.xml.crypto.dsig.keyinfo.KeyInfoFactory;
/**
* Indicates an exceptional condition that occured during the XML
Modified: xml/security/trunk/src/javax/xml/crypto/NoSuchMechanismException.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/javax/xml/crypto/NoSuchMechanismException.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/javax/xml/crypto/NoSuchMechanismException.java (original)
+++ xml/security/trunk/src/javax/xml/crypto/NoSuchMechanismException.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,10 +24,7 @@
import java.io.PrintStream;
import java.io.PrintWriter;
-import javax.xml.crypto.dsig.Manifest;
-import javax.xml.crypto.dsig.XMLSignature;
import javax.xml.crypto.dsig.XMLSignatureFactory;
-import javax.xml.crypto.dsig.keyinfo.KeyInfo;
import javax.xml.crypto.dsig.keyinfo.KeyInfoFactory;
/**
Modified: xml/security/trunk/src/javax/xml/crypto/dsig/Transform.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/javax/xml/crypto/dsig/Transform.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/javax/xml/crypto/dsig/Transform.java (original)
+++ xml/security/trunk/src/javax/xml/crypto/dsig/Transform.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
import java.security.spec.AlgorithmParameterSpec;
import javax.xml.crypto.AlgorithmMethod;
import javax.xml.crypto.Data;
-import javax.xml.crypto.OctetStreamData;
import javax.xml.crypto.XMLCryptoContext;
import javax.xml.crypto.XMLStructure;
import javax.xml.crypto.dsig.spec.TransformParameterSpec;
Modified: xml/security/trunk/src/javax/xml/crypto/dsig/XMLDSigSecurity.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/javax/xml/crypto/dsig/XMLDSigSecurity.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/javax/xml/crypto/dsig/XMLDSigSecurity.java (original)
+++ xml/security/trunk/src/javax/xml/crypto/dsig/XMLDSigSecurity.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,7 +29,6 @@
*/
package javax.xml.crypto.dsig;
-import java.lang.reflect.*;
import java.security.Provider;
import java.security.Security;
import java.util.*;
Modified: xml/security/trunk/src/javax/xml/crypto/dsig/XMLSignContext.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/javax/xml/crypto/dsig/XMLSignContext.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/javax/xml/crypto/dsig/XMLSignContext.java (original)
+++ xml/security/trunk/src/javax/xml/crypto/dsig/XMLSignContext.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
*/
package javax.xml.crypto.dsig;
-import javax.xml.crypto.KeySelector;
import javax.xml.crypto.XMLCryptoContext;
/**
Modified: xml/security/trunk/src/javax/xml/crypto/dsig/keyinfo/KeyValue.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/javax/xml/crypto/dsig/keyinfo/KeyValue.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/javax/xml/crypto/dsig/keyinfo/KeyValue.java (original)
+++ xml/security/trunk/src/javax/xml/crypto/dsig/keyinfo/KeyValue.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
package javax.xml.crypto.dsig.keyinfo;
import java.security.KeyException;
-import java.security.KeyStore;
import java.security.PublicKey;
import java.security.interfaces.DSAPublicKey;
import java.security.interfaces.RSAPublicKey;
Modified: xml/security/trunk/src/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java (original)
+++ xml/security/trunk/src/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import java.util.Map.Entry;
/**
* Parameters for the <a href="http://www.w3.org/TR/xmldsig-core/#sec-XPath">
Modified: xml/security/trunk/src/org/apache/xml/security/c14n/implementations/UtfHelpper.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/c14n/implementations/UtfHelpper.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/c14n/implementations/UtfHelpper.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/c14n/implementations/UtfHelpper.java Tue Jul 14 15:33:19 2009
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
package org.apache.xml.security.c14n.implementations;
import java.io.IOException;
Modified: xml/security/trunk/src/org/apache/xml/security/exceptions/XMLSecurityRuntimeException.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/exceptions/XMLSecurityRuntimeException.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/exceptions/XMLSecurityRuntimeException.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/exceptions/XMLSecurityRuntimeException.java Tue Jul 14 15:33:19 2009
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
package org.apache.xml.security.exceptions;
import java.io.PrintStream;
Modified: xml/security/trunk/src/org/apache/xml/security/keys/content/x509/XMLX509SKI.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/keys/content/x509/XMLX509SKI.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/keys/content/x509/XMLX509SKI.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/keys/content/x509/XMLX509SKI.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,12 +16,7 @@
*/
package org.apache.xml.security.keys.content.x509;
-import java.io.IOException;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
import java.security.cert.X509Certificate;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.utils.Base64;
Modified: xml/security/trunk/src/org/apache/xml/security/signature/Reference.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/signature/Reference.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/signature/Reference.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/signature/Reference.java Tue Jul 14 15:33:19 2009
@@ -693,7 +693,7 @@
XMLSignatureInput output=this.dereferenceURIandPerformTransforms(os);
// if signing and c14n11 property == true explicitly add
// C14N11 transform if needed
- if (this.useC14N11 && !validating &&
+ if (Reference.useC14N11 && !validating &&
!output.isOutputStreamSet() && !output.isOctetStream()) {
if (transforms == null) {
transforms = new Transforms(this._doc);
Modified: xml/security/trunk/src/org/apache/xml/security/signature/XMLSignature.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/signature/XMLSignature.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/signature/XMLSignature.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/signature/XMLSignature.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2008 The Apache Software Foundation.
+ * Copyright 1999-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -44,7 +44,6 @@
import org.apache.xml.security.utils.resolver.ResourceResolverSpi;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.w3c.dom.Text;
/**
Modified: xml/security/trunk/src/org/apache/xml/security/utils/ElementChecker.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/utils/ElementChecker.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/utils/ElementChecker.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/utils/ElementChecker.java Tue Jul 14 15:33:19 2009
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
package org.apache.xml.security.utils;
import org.apache.xml.security.exceptions.XMLSecurityException;
Modified: xml/security/trunk/src/org/apache/xml/security/utils/ElementCheckerImpl.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/utils/ElementCheckerImpl.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/utils/ElementCheckerImpl.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/utils/ElementCheckerImpl.java Tue Jul 14 15:33:19 2009
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
package org.apache.xml.security.utils;
import org.apache.xml.security.exceptions.XMLSecurityException;
Modified: xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java (original)
+++ xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.IOException;
import java.io.OutputStream;
import java.security.spec.AlgorithmParameterSpec;
import java.security.InvalidAlgorithmParameterException;
@@ -35,7 +34,6 @@
import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.TransformException;
import javax.xml.crypto.dsig.TransformService;
-import javax.xml.crypto.dsig.XMLSignatureException;
import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
import org.apache.xml.security.c14n.Canonicalizer;
@@ -44,7 +42,6 @@
import org.apache.xml.security.transforms.Transform;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
public abstract class ApacheCanonicalizer extends TransformService {
Modified: xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java (original)
+++ xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
package org.jcp.xml.dsig.internal.dom;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
Modified: xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/ApacheTransform.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/ApacheTransform.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/ApacheTransform.java (original)
+++ xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/ApacheTransform.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@
import java.util.logging.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
import org.apache.xml.security.signature.XMLSignatureInput;
import org.apache.xml.security.transforms.Transform;
Modified: xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java (original)
+++ xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
import java.security.InvalidAlgorithmParameterException;
-import javax.xml.crypto.XMLStructure;
import javax.xml.crypto.dsig.spec.TransformParameterSpec;
/**
Modified: xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java (original)
+++ xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
import java.math.BigInteger;
import javax.xml.crypto.*;
import javax.xml.crypto.dom.DOMCryptoContext;
-import javax.xml.crypto.dsig.*;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
Modified: xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java (original)
+++ xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
import javax.xml.crypto.*;
import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dsig.dom.DOMSignContext;
import javax.xml.crypto.dsig.keyinfo.KeyInfo;
import javax.xml.crypto.dom.*;
Modified: xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java (original)
+++ xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,8 +27,6 @@
import java.security.PublicKey;
import java.util.List;
import javax.xml.crypto.*;
-import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dom.*;
import javax.xml.crypto.dsig.keyinfo.*;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java (original)
+++ xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -45,8 +45,6 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.apache.xml.security.signature.XMLSignatureInput;
-
/**
* DOM-based implementation of RetrievalMethod.
*
Modified: xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java (original)
+++ xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -41,7 +41,6 @@
import org.apache.xml.security.utils.Base64;
import org.apache.xml.security.utils.UnsyncBufferedOutputStream;
-import org.apache.xml.security.utils.XMLUtils;
/**
* DOM-based implementation of SignedInfo.
@@ -185,7 +184,7 @@
DOMSubTreeData subTree = new DOMSubTreeData(localSiElem, true);
try {
- Data data = ((DOMCanonicalizationMethod)
+ ((DOMCanonicalizationMethod)
canonicalizationMethod).canonicalize(subTree, context, os);
} catch (TransformException te) {
throw new XMLSignatureException(te);
Modified: xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMTransform.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMTransform.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMTransform.java (original)
+++ xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMTransform.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,13 +31,11 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import javax.xml.crypto.*;
import javax.xml.crypto.dsig.*;
import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.dom.DOMSignContext;
-import javax.xml.crypto.dsig.spec.TransformParameterSpec;
/**
* DOM-based abstract implementation of Transform.
Modified: xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java (original)
+++ xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@
import javax.xml.crypto.*;
import javax.xml.crypto.dom.*;
-import javax.xml.crypto.dsig.*;
/**
* DOM-based implementation of URIDereferencer.
Modified: xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMUtils.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMUtils.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMUtils.java (original)
+++ xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMUtils.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import javax.xml.crypto.*;
-import javax.xml.crypto.dsig.dom.DOMSignContext;
import javax.xml.crypto.dsig.*;
import javax.xml.crypto.dsig.spec.*;
Modified: xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java (original)
+++ xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -36,7 +36,6 @@
import javax.xml.crypto.dsig.dom.DOMValidateContext;
import javax.xml.crypto.dsig.keyinfo.KeyInfo;
-import java.io.*;
import java.security.InvalidKeyException;
import java.security.Key;
import java.security.Provider;
Modified: xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java (original)
+++ xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@
import java.security.InvalidAlgorithmParameterException;
import java.security.NoSuchAlgorithmException;
-import java.security.spec.AlgorithmParameterSpec;
import java.util.List;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java (original)
+++ xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation.
+ * Copyright 2005-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@
import org.w3c.dom.Node;
import javax.xml.crypto.*;
-import javax.xml.crypto.dsig.*;
import javax.xml.crypto.dsig.spec.TransformParameterSpec;
import javax.xml.crypto.dsig.spec.XSLTTransformParameterSpec;
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/KeySelectors.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/KeySelectors.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/KeySelectors.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/KeySelectors.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,19 +25,11 @@
import java.util.*;
import javax.xml.crypto.*;
import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dom.*;
import javax.xml.crypto.dsig.keyinfo.*;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
import javax.crypto.SecretKey;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.Element;
-import org.w3c.dom.traversal.*;
import sun.security.util.DerValue;
import sun.security.x509.X500Name;
-import junit.framework.*;
/**
* This is a class which supplies several KeySelector implementations
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AllTests.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AllTests.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AllTests.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AllTests.java Tue Jul 14 15:33:19 2009
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2006-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
package javax.xml.crypto.test.dsig;
import junit.framework.Test;
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AppA.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AppA.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AppA.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AppA.java Tue Jul 14 15:33:19 2009
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2006-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
package javax.xml.crypto.test.dsig;
import java.security.Security;
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AppB.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AppB.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AppB.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AppB.java Tue Jul 14 15:33:19 2009
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
package javax.xml.crypto.test.dsig;
import java.security.Provider;
@@ -13,6 +29,6 @@
public void dsig() throws Exception {
Provider p = Security.getProvider("XMLDSig");
- TransformService ts = TransformService.getInstance(Transform.XPATH, "DOM", p);
+ TransformService.getInstance(Transform.XPATH, "DOM", p);
}
}
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/C14N11Test.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/C14N11Test.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/C14N11Test.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/C14N11Test.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 The Apache Software Foundation.
+ * Copyright 2008-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,8 +17,6 @@
package javax.xml.crypto.test.dsig;
import java.io.File;
-import java.io.FileInputStream;
-import java.security.KeyStore;
import java.security.Security;
import javax.xml.crypto.KeySelector;
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CanonicalizationMethodTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CanonicalizationMethodTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CanonicalizationMethodTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CanonicalizationMethodTest.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
*/
package javax.xml.crypto.test.dsig;
-import java.io.File;
import java.security.*;
import java.security.spec.AlgorithmParameterSpec;
import javax.xml.crypto.dsig.*;
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/ClassLoaderTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/ClassLoaderTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/ClassLoaderTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/ClassLoaderTest.java Tue Jul 14 15:33:19 2009
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2006-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
package javax.xml.crypto.test.dsig;
import java.lang.reflect.Method;
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@
import java.security.Security;
import java.security.cert.Certificate;
import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
import java.security.cert.X509CRL;
import java.util.*;
import javax.xml.parsers.*;
@@ -297,7 +296,7 @@
+ " id('notaries')) = " + "\n"
+ " count(ancestor-or-self::node()) " + "\n";
- XPathFilterParameterSpec xfp = new XPathFilterParameterSpec(expr,
+ new XPathFilterParameterSpec(expr,
Collections.singletonMap("dsig", XMLSignature.XMLNS));
// refs.add(fac.newReference("", sha1, Collections.singletonList
// (fac.newTransform(Transform.XPATH, xfp)),
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,9 +29,6 @@
import javax.xml.crypto.dsig.keyinfo.*;
import javax.xml.crypto.dsig.spec.*;
import javax.xml.parsers.*;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.stream.*;
import org.w3c.dom.*;
import junit.framework.*;
@@ -175,10 +172,4 @@
assertTrue(sig2.validate(dvc));
}
- private void dumpDocument(Document doc, Writer w) throws Exception {
- TransformerFactory tf = TransformerFactory.newInstance();
- Transformer trans = tf.newTransformer();
-// trans.setOutputProperty(OutputKeys.INDENT, "yes");
- trans.transform(new DOMSource(doc), new StreamResult(w));
- }
}
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,9 +28,6 @@
import javax.xml.crypto.dsig.keyinfo.*;
import javax.xml.crypto.dsig.spec.*;
import javax.xml.parsers.*;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.stream.*;
import org.w3c.dom.*;
import junit.framework.*;
@@ -171,10 +168,4 @@
assertTrue(sig2.validate(dvc));
}
- private void dumpDocument(Document doc, Writer w) throws Exception {
- TransformerFactory tf = TransformerFactory.newInstance();
- Transformer trans = tf.newTransformer();
-// trans.setOutputProperty(OutputKeys.INDENT, "yes");
- trans.transform(new DOMSource(doc), new StreamResult(w));
- }
}
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,17 +19,12 @@
*/
package javax.xml.crypto.test.dsig;
-import java.io.*;
import java.security.*;
import java.util.*;
import javax.xml.crypto.dsig.*;
import javax.xml.crypto.dsig.dom.*;
-import javax.xml.crypto.dsig.keyinfo.*;
import javax.xml.crypto.dsig.spec.*;
import javax.xml.parsers.*;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.stream.*;
import org.w3c.dom.*;
import junit.framework.*;
@@ -175,10 +170,4 @@
assertTrue(sig2.validate(dvc));
}
- private void dumpDocument(Document doc, Writer w) throws Exception {
- TransformerFactory tf = TransformerFactory.newInstance();
- Transformer trans = tf.newTransformer();
-// trans.setOutputProperty(OutputKeys.INDENT, "yes");
- trans.transform(new DOMSource(doc), new StreamResult(w));
- }
}
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/DetachedTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/DetachedTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/DetachedTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/DetachedTest.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,13 +22,11 @@
import javax.xml.crypto.dsig.*;
import javax.xml.crypto.dsig.dom.DOMSignContext;
import javax.xml.crypto.dsig.dom.DOMValidateContext;
-import javax.xml.crypto.dom.*;
import javax.xml.crypto.dsig.keyinfo.*;
import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
import java.security.*;
import java.util.*;
import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
import org.w3c.dom.Document;
import junit.framework.*;
@@ -158,7 +156,7 @@
Iterator i = signature.getSignedInfo().getReferences().iterator();
for (int j=0; i.hasNext(); j++) {
Reference reference = (Reference) i.next();
- boolean refValid = reference.validate(vc);
+ reference.validate(vc);
}
fail("Signature failed core validation");
}
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/Driver.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/Driver.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/Driver.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/Driver.java Tue Jul 14 15:33:19 2009
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
package javax.xml.crypto.test.dsig;
import javax.xml.crypto.dsig.CanonicalizationMethod;
@@ -15,7 +31,7 @@
("DOM", new org.jcp.xml.dsig.internal.dom.XMLDSigRI());
long start = System.currentTimeMillis();
for (int i=0; i<100; i++) {
- CanonicalizationMethod cm = fac.newCanonicalizationMethod
+ fac.newCanonicalizationMethod
(CanonicalizationMethod.EXCLUSIVE, (C14NMethodParameterSpec) null);
}
long end = System.currentTimeMillis();
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -142,8 +142,7 @@
String file = "signature-rsa-detached-xslt-transform-bad-retrieval-method.xml";
try {
- boolean coreValidity =
- validator.validate(file,
+ validator.validate(file,
new KeySelectors.CollectionKeySelector(base));
fail("Should throw XMLSignatureException for using DSA key with " +
"RSA algorithm");
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SecureXSLTTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SecureXSLTTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SecureXSLTTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SecureXSLTTest.java Tue Jul 14 15:33:19 2009
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2006-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
package javax.xml.crypto.test.dsig;
import java.io.*;
@@ -62,7 +78,7 @@
if (sig.validate(valContext)) {
System.err.println("Signature UNEXPECTEDLY passed validation");
}
- Reference ref = (Reference) sig.getSignedInfo().getReferences().get(0);
+ sig.getSignedInfo().getReferences().get(0);
} catch (XMLSignatureException xse) {
// this is good, but still make sure attack was not successful
// by falling through and checking if file was created
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
*/
package javax.xml.crypto.test.dsig;
-import java.io.*;
import java.util.*;
import javax.xml.crypto.dsig.*;
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SignaturePropertyTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SignaturePropertyTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SignaturePropertyTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SignaturePropertyTest.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
*/
package javax.xml.crypto.test.dsig;
-import java.io.*;
import java.util.*;
import javax.xml.crypto.dsig.*;
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SignatureValidator.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SignatureValidator.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SignatureValidator.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SignatureValidator.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,22 +20,16 @@
package javax.xml.crypto.test.dsig;
import java.io.*;
-import java.security.*;
import java.util.*;
import javax.xml.crypto.*;
import javax.xml.crypto.dsig.*;
import javax.xml.crypto.dsig.dom.DOMValidateContext;
-import javax.xml.crypto.dom.*;
-import javax.xml.crypto.dsig.keyinfo.*;
import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.Element;
import org.w3c.dom.traversal.*;
-import junit.framework.*;
-
/**
* This is a class which performs xml signature validation upon request
*
@@ -93,7 +87,7 @@
Iterator i = signature.getSignedInfo().getReferences().iterator();
for (int j=0; i.hasNext(); j++) {
Reference reference = (Reference) i.next();
- boolean refValid = reference.validate(vc);
+ reference.validate(vc);
}
}
return coreValidity;
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/TestUtils.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/TestUtils.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/TestUtils.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/TestUtils.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
import javax.crypto.SecretKey;
import javax.xml.crypto.dsig.*;
import javax.xml.crypto.dsig.dom.DOMValidateContext;
-import javax.xml.crypto.dsig.keyinfo.*;
import javax.xml.crypto.dsig.spec.*;
import javax.xml.crypto.dom.*;
import javax.xml.crypto.*;
@@ -52,11 +51,6 @@
private static final String RSA_MOD = "010800185049102889923150759252557522305032794699952150943573164381936603255999071981574575044810461362008102247767482738822150129277490998033971789476107463";
private static final String RSA_PUB = "065537";
private static final String RSA_PRIV = "0161169735844219697954459962296126719476357984292128166117072108359155865913405986839960884870654387514883422519600695753920562880636800379454345804879553";
- private static final String RSA_P = "0115424415723722114324966978423259908612124678699162475636761464258454949949323";
- private static final String RSA_Q = "0102758196571776648976474223306363419966067908877619912985851335233169851905977";
- private static final String RSA_PE = "046029221736415726351267405909515200750383424291661371450734102390935198695783";
- private static final String RSA_QE = "044015259993025528938883140770194453900658533927591226289558855038612449192129";
- private static final String RSA_COEFF = "039865059011857370650977286999500339769808774456169959084951368761860263797695";
private TestUtils() {}
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/TransformTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/TransformTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/TransformTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/TransformTest.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@
import javax.xml.crypto.dsig.spec.XPathFilter2ParameterSpec;
import javax.xml.crypto.dsig.spec.XSLTTransformParameterSpec;
import java.security.*;
-import java.security.spec.*;
import junit.framework.*;
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/X509KeySelector.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/X509KeySelector.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/X509KeySelector.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/X509KeySelector.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
*/
package javax.xml.crypto.test.dsig;
-import java.io.InputStream;
import java.io.IOException;
import java.security.Key;
import java.security.KeyStore;
@@ -34,7 +33,6 @@
import javax.security.auth.x500.X500Principal;
import javax.xml.crypto.*;
import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dom.*;
import javax.xml.crypto.dsig.keyinfo.*;
import org.jcp.xml.dsig.internal.dom.DOMRetrievalMethod;
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLObjectTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLObjectTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLObjectTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLObjectTest.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
*/
package javax.xml.crypto.test.dsig;
-import java.io.*;
import java.util.*;
import javax.xml.crypto.dsig.*;
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLSignContextTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLSignContextTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLSignContextTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLSignContextTest.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,17 +19,13 @@
*/
package javax.xml.crypto.test.dsig;
-import java.io.File;
-import java.io.ByteArrayInputStream;
import javax.xml.crypto.*;
import javax.xml.crypto.dsig.*;
import javax.xml.crypto.dsig.dom.DOMSignContext;
-import javax.xml.crypto.dom.*;
import javax.xml.crypto.KeySelector;
import java.security.*;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
-import java.util.Arrays;
import org.w3c.dom.Document;
import junit.framework.*;
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,18 +20,13 @@
package javax.xml.crypto.test.dsig;
import java.io.File;
-import java.math.BigInteger;
-import java.util.*;
import java.security.NoSuchProviderException;
import java.security.Provider;
-import java.security.KeyException;
-import java.security.PublicKey;
import java.security.Security;
import javax.xml.crypto.dsig.keyinfo.*;
import javax.xml.crypto.*;
import javax.xml.crypto.dsig.*;
import javax.xml.crypto.dsig.dom.DOMValidateContext;
-import javax.xml.crypto.dom.*;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.w3c.dom.Document;
@@ -67,19 +62,17 @@
public void testgetInstance() {
try {
- XMLSignatureFactory fac =
- XMLSignatureFactory.getInstance("non-existent");
+ XMLSignatureFactory.getInstance("non-existent");
fail("Should throw NoSuchMechanismException if no impl found");
} catch (NoSuchMechanismException ex) {}
try {
- XMLSignatureFactory fac = XMLSignatureFactory.getInstance(null);
+ XMLSignatureFactory.getInstance(null);
fail("Should raise a NPE for null mechanismType");
} catch (NullPointerException npe) {}
try {
- XMLSignatureFactory fac =
- XMLSignatureFactory.getInstance("DOM", "non-existent");
+ XMLSignatureFactory.getInstance("DOM", "non-existent");
fail("Should throw NoSuchProviderException if specified " +
"provider is not found");
} catch (NoSuchProviderException nspe) {
@@ -89,13 +82,12 @@
}
try {
- XMLSignatureFactory fac = XMLSignatureFactory.getInstance(null);
+ XMLSignatureFactory.getInstance(null);
fail("Should raise a NPE for null mechanismType");
} catch (NullPointerException npe) {}
try {
- XMLSignatureFactory fac =
- XMLSignatureFactory.getInstance("DOM", (Provider) null);
+ XMLSignatureFactory.getInstance("DOM", (Provider) null);
fail("Should raise a NPE for null provider");
} catch (NullPointerException npe) {}
}
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLSignatureTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLSignatureTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLSignatureTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLSignatureTest.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
*/
package javax.xml.crypto.test.dsig;
-import java.io.*;
import java.util.*;
import java.security.*;
import javax.xml.crypto.dsig.*;
@@ -27,20 +26,9 @@
import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
import javax.xml.crypto.dsig.dom.DOMSignContext;
import javax.xml.crypto.dsig.dom.DOMValidateContext;
-import javax.xml.transform.*;
-import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import junit.framework.*;
@@ -260,10 +248,4 @@
}
}
- private void dumpDocument(Document doc, Writer w) throws Exception {
- TransformerFactory tf = TransformerFactory.newInstance();
- Transformer trans = tf.newTransformer();
-// trans.setOutputProperty(OutputKeys.INDENT, "yes");
- trans.transform(new DOMSource(doc), new StreamResult(w));
- }
}
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLValidateContextTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLValidateContextTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLValidateContextTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLValidateContextTest.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,8 +19,6 @@
*/
package javax.xml.crypto.test.dsig;
-import java.io.File;
-import java.io.ByteArrayInputStream;
import javax.xml.crypto.*;
import javax.xml.crypto.dsig.dom.DOMValidateContext;
import javax.xml.crypto.dsig.*;
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/dom/DOMValidateContextTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/dom/DOMValidateContextTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/dom/DOMValidateContextTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/dom/DOMValidateContextTest.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,10 +20,7 @@
package javax.xml.crypto.test.dsig.dom;
import java.io.*;
-import java.util.*;
-import javax.xml.crypto.*;
import javax.xml.crypto.dsig.dom.DOMValidateContext;
-import javax.xml.crypto.dsig.XMLValidateContext;
import junit.framework.*;
@@ -60,9 +57,8 @@
public void testConstructor() throws Exception {
assertNotNull(domVC);
- DOMValidateContext vc;
try {
- vc = new DOMValidateContext(TestUtils.getPublicKey("RSA"), null);
+ new DOMValidateContext(TestUtils.getPublicKey("RSA"), null);
fail("Should throw a NPE for null node");
} catch (NullPointerException npe) {
} catch (Exception ex) {
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/KeyInfoFactoryTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/KeyInfoFactoryTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/KeyInfoFactoryTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/KeyInfoFactoryTest.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,8 +25,6 @@
import java.security.PublicKey;
import javax.xml.crypto.dsig.keyinfo.*;
import javax.xml.crypto.*;
-import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dom.*;
import junit.framework.*;
@@ -53,12 +51,12 @@
public void testgetInstance() {
try {
- KeyInfoFactory fac = KeyInfoFactory.getInstance("non-existent");
+ KeyInfoFactory.getInstance("non-existent");
fail("Should throw NoSuchMechanismException if no impl found");
} catch (NoSuchMechanismException ex) {}
try {
- KeyInfoFactory fac = KeyInfoFactory.getInstance(null);
+ KeyInfoFactory.getInstance(null);
fail("Should raise a NPE for null xmltype");
} catch (NullPointerException npe) {}
}
@@ -119,7 +117,7 @@
} catch (KeyException ke) { }
try {
- KeyValue kv = factory.newKeyValue((PublicKey) null);
+ factory.newKeyValue((PublicKey) null);
fail("Should raise a NPE for null key");
} catch (KeyException ke) {
fail("Should raise a NPE for null key");
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/KeyInfoTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/KeyInfoTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/KeyInfoTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/KeyInfoTest.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
import java.util.*;
import javax.xml.crypto.*;
-import javax.xml.crypto.dsig.*;
import javax.xml.crypto.dom.*;
import javax.xml.crypto.dsig.keyinfo.*;
import javax.xml.parsers.DocumentBuilderFactory;
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/KeyNameTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/KeyNameTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/KeyNameTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/KeyNameTest.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,12 +19,7 @@
*/
package javax.xml.crypto.test.dsig.keyinfo;
-import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dom.*;
import javax.xml.crypto.dsig.keyinfo.*;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import org.w3c.dom.Document;
import junit.framework.*;
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/KeyValueTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/KeyValueTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/KeyValueTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/KeyValueTest.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,11 +19,7 @@
*/
package javax.xml.crypto.test.dsig.keyinfo;
-import java.io.*;
import java.security.*;
-import java.security.interfaces.*;
-import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dom.*;
import javax.xml.crypto.dsig.keyinfo.*;
import junit.framework.*;
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,13 +23,7 @@
import java.util.Collections;
import java.util.List;
import javax.xml.crypto.*;
-import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dom.*;
import javax.xml.crypto.dsig.keyinfo.*;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
import junit.framework.*;
@@ -86,7 +80,7 @@
}
}
try {
- PGPData pd = fac.newPGPData
+ fac.newPGPData
(values[0], Collections.singletonList(new Object()));
fail("Added PGP element of wrong type");
} catch (ClassCastException ex) {
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/RetrievalMethodTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/RetrievalMethodTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/RetrievalMethodTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/RetrievalMethodTest.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,13 +19,7 @@
*/
package javax.xml.crypto.test.dsig.keyinfo;
-import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dom.*;
import javax.xml.crypto.dsig.keyinfo.*;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
import junit.framework.*;
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/X509DataTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/X509DataTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/X509DataTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/X509DataTest.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,12 +23,7 @@
import java.security.cert.X509Certificate;
import java.security.cert.X509CRL;
import javax.xml.crypto.*;
-import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dom.*;
import javax.xml.crypto.dsig.keyinfo.*;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import org.w3c.dom.Document;
import junit.framework.*;
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/X509IssuerSerialTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/X509IssuerSerialTest.java?rev=793943&r1=793942&r2=793943&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/X509IssuerSerialTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/keyinfo/X509IssuerSerialTest.java Tue Jul 14 15:33:19 2009
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 The Apache Software Foundation.
+ * Copyright 2006-2009 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,18 +19,8 @@
*/
package javax.xml.crypto.test.dsig.keyinfo;
-import java.util.List;
-import java.util.Arrays;
import java.math.BigInteger;
-import java.security.cert.X509Certificate;
-import java.security.cert.X509CRL;
-import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dom.*;
import javax.xml.crypto.dsig.keyinfo.*;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
import junit.framework.*;