You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by gi...@apache.org on 2013/03/24 16:47:35 UTC
svn commit: r1460408 [1/3] - in /santuario/xml-security-java/trunk:
samples/org/apache/xml/security/samples/encryption/
samples/org/apache/xml/security/samples/iaik/
samples/org/apache/xml/security/samples/signature/
samples/org/apache/xml/security/sam...
Author: giger
Date: Sun Mar 24 15:47:32 2013
New Revision: 1460408
URL: http://svn.apache.org/r1460408
Log:
fixes and cleanups
Modified:
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/encryption/Decrypter.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/encryption/Encrypter.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateCollectableSignature.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateEnvelopingSignature.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleSixteen.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleTwentyThree.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateSignature.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/HereSigner.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/NullURIReferenceResolver.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyCollectableSignature.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/resolver/OfflineResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/JCEMapper.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLEncryptionException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignedInfo.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/Init.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/params/InclusiveNamespaces.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Base64.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JDKXPathAPI.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Signature11ElementProxy.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/SignatureElementProxy.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TestUtils.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/dom/DOMValidateContextTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoFactoryTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509DataTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/C14nHelperTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BobKeyResolver.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IBMTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/RSASecurityTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/DEREncodedKeyValueTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/DEREncodedKeyValueResolverTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyResolverTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/resource/TestVectorResolver.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/Base64Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResolverDirectHTTPTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/TestSecurityEventListener.java
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/encryption/Decrypter.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/encryption/Decrypter.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/encryption/Decrypter.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/encryption/Decrypter.java Sun Mar 24 15:47:32 2013
@@ -47,8 +47,7 @@ import javax.xml.transform.OutputKeys;
*/
public class Decrypter {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
+ static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(
Decrypter.class.getName());
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/encryption/Encrypter.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/encryption/Encrypter.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/encryption/Encrypter.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/encryption/Encrypter.java Sun Mar 24 15:47:32 2013
@@ -48,8 +48,7 @@ import javax.xml.transform.OutputKeys;
*/
public class Encrypter {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
+ static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(
Encrypter.class.getName());
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java Sun Mar 24 15:47:32 2013
@@ -42,9 +42,8 @@ import org.w3c.dom.Element;
*/
public class IAIKInterOp {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(IAIKInterOp.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(IAIKInterOp.class);
/** Field schemaValidate */
static final boolean schemaValidate = false;
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateCollectableSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateCollectableSignature.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateCollectableSignature.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateCollectableSignature.java Sun Mar 24 15:47:32 2013
@@ -42,9 +42,8 @@ import org.w3c.dom.Element;
*/
public class CreateCollectableSignature {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(CreateCollectableSignature.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(CreateCollectableSignature.class);
/** Field passphrase */
public static final String passphrase =
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateEnvelopingSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateEnvelopingSignature.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateEnvelopingSignature.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateEnvelopingSignature.java Sun Mar 24 15:47:32 2013
@@ -37,9 +37,8 @@ import org.w3c.dom.Element;
*/
public class CreateEnvelopingSignature {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(CreateSignature.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(CreateSignature.class);
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleSixteen.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleSixteen.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleSixteen.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleSixteen.java Sun Mar 24 15:47:32 2013
@@ -55,9 +55,8 @@ import org.w3c.dom.Node;
*/
public class CreateMerlinsExampleSixteen {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(CreateMerlinsExampleSixteen.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(CreateMerlinsExampleSixteen.class);
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleTwentyThree.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleTwentyThree.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleTwentyThree.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleTwentyThree.java Sun Mar 24 15:47:32 2013
@@ -55,9 +55,8 @@ import org.w3c.dom.Node;
*/
public class CreateMerlinsExampleTwentyThree {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(CreateMerlinsExampleTwentyThree.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(CreateMerlinsExampleTwentyThree.class);
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateSignature.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateSignature.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/CreateSignature.java Sun Mar 24 15:47:32 2013
@@ -38,9 +38,8 @@ import org.w3c.dom.Element;
*/
public class CreateSignature {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(CreateSignature.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(CreateSignature.class);
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/HereSigner.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/HereSigner.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/HereSigner.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/HereSigner.java Sun Mar 24 15:47:32 2013
@@ -41,9 +41,8 @@ import org.w3c.dom.Element;
*/
public class HereSigner {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(HereSigner.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(HereSigner.class);
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/NullURIReferenceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/NullURIReferenceResolver.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/NullURIReferenceResolver.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/NullURIReferenceResolver.java Sun Mar 24 15:47:32 2013
@@ -31,9 +31,8 @@ import org.w3c.dom.Attr;
*/
public class NullURIReferenceResolver extends ResourceResolverSpi {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(NullURIReferenceResolver.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(NullURIReferenceResolver.class);
/** Field _data[] */
byte _data[] = null;
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyCollectableSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyCollectableSignature.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyCollectableSignature.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyCollectableSignature.java Sun Mar 24 15:47:32 2013
@@ -40,9 +40,8 @@ import org.w3c.dom.NodeList;
*/
public class VerifyCollectableSignature {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(VerifyCollectableSignature.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(VerifyCollectableSignature.class);
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java Sun Mar 24 15:47:32 2013
@@ -41,9 +41,8 @@ import org.w3c.dom.Element;
*/
public class VerifyMerlinsExamplesFifteen {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(VerifyMerlinsExamplesFifteen.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(VerifyMerlinsExamplesFifteen.class);
/** Field schemaValidate */
static final boolean schemaValidate = false;
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java Sun Mar 24 15:47:32 2013
@@ -43,9 +43,8 @@ import org.w3c.dom.Element;
*/
public class VerifyMerlinsExamplesSixteen {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(VerifyMerlinsExamplesSixteen.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(VerifyMerlinsExamplesSixteen.class);
/** Field schemaValidate */
static final boolean schemaValidate = false;
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java Sun Mar 24 15:47:32 2013
@@ -43,9 +43,8 @@ import org.w3c.dom.Element;
*/
public class VerifyMerlinsExamplesTwentyThree {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(VerifyMerlinsExamplesTwentyThree.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(VerifyMerlinsExamplesTwentyThree.class);
/** Field schemaValidate */
static final boolean schemaValidate = false;
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java Sun Mar 24 15:47:32 2013
@@ -29,9 +29,8 @@ import org.apache.xml.security.transform
*/
public class SampleTransformNone extends TransformSpi {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(SampleTransformNone.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(SampleTransformNone.class);
/** Field implementedTransformURI */
public static final String implementedTransformURI =
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/resolver/OfflineResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/resolver/OfflineResolver.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/resolver/OfflineResolver.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/resolver/OfflineResolver.java Sun Mar 24 15:47:32 2013
@@ -39,9 +39,8 @@ import org.w3c.dom.Attr;
*/
public class OfflineResolver extends ResourceResolverSpi {
- /** {@link org.apache.commons.logging} logging facility */
- static org.slf4j.Logger log =
- org.slf4j.LoggerFactory.getLogger(OfflineResolver.class.getName());
+ static org.slf4j.Logger log =
+ org.slf4j.LoggerFactory.getLogger(OfflineResolver.class);
/** Field _uriMap */
static Map<String, String> _uriMap = null;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java Sun Mar 24 15:47:32 2013
@@ -105,7 +105,7 @@ public abstract class ApacheTransform ex
if (data == null) {
throw new NullPointerException("data must not be null");
}
- return transformIt(data, xc, (OutputStream)null);
+ return transformIt(data, xc, null);
}
@Override
@@ -145,7 +145,7 @@ public abstract class ApacheTransform ex
Boolean secureValidation = (Boolean)
xc.getProperty("org.apache.jcp.xml.dsig.secureValidation");
- if (secureValidation != null && secureValidation.booleanValue()) {
+ if (secureValidation != null && secureValidation) {
String algorithm = getAlgorithm();
if (Transforms.TRANSFORM_XSLT.equals(algorithm)) {
throw new TransformException(
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java Sun Mar 24 15:47:32 2013
@@ -121,7 +121,7 @@ public abstract class DOMHMACSignatureMe
SignatureMethodParameterSpec unmarshalParams(Element paramsElem)
throws MarshalException
{
- outputLength = Integer.valueOf(textOfNode(paramsElem)).intValue();
+ outputLength = Integer.parseInt(textOfNode(paramsElem));
outputLengthSet = true;
if (log.isDebugEnabled()) {
log.debug("unmarshalled outputLength: " + outputLength);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java Sun Mar 24 15:47:32 2013
@@ -88,7 +88,7 @@ public final class DOMManifest extends B
Boolean secureValidation = (Boolean)
context.getProperty("org.apache.jcp.xml.dsig.secureValidation");
boolean secVal = false;
- if (secureValidation != null && secureValidation.booleanValue()) {
+ if (secureValidation != null && secureValidation) {
secVal = true;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java Sun Mar 24 15:47:32 2013
@@ -127,7 +127,7 @@ public final class DOMPGPData extends Ba
}
this.keyId = keyId.clone();
this.keyPacket = keyPacket == null ? null
- : (byte[])keyPacket.clone();
+ : keyPacket.clone();
if (keyPacket != null) {
checkKeyPacket(keyPacket);
}
@@ -171,12 +171,12 @@ public final class DOMPGPData extends Ba
@Override
public byte[] getKeyId() {
- return (keyId == null ? null : (byte[])keyId.clone());
+ return (keyId == null ? null : keyId.clone());
}
@Override
public byte[] getKeyPacket() {
- return (keyPacket == null ? null : (byte[])keyPacket.clone());
+ return (keyPacket == null ? null : keyPacket.clone());
}
@Override
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java Sun Mar 24 15:47:32 2013
@@ -76,8 +76,8 @@ public final class DOMReference extends
AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
@Override
public Boolean run() {
- return Boolean.valueOf(Boolean.getBoolean
- ("com.sun.org.apache.xml.internal.security.useC14N11"));
+ return Boolean.getBoolean
+ ("com.sun.org.apache.xml.internal.security.useC14N11");
}
});
@@ -196,7 +196,7 @@ public final class DOMReference extends
Boolean secureValidation = (Boolean)
context.getProperty("org.apache.jcp.xml.dsig.secureValidation");
boolean secVal = false;
- if (secureValidation != null && secureValidation.booleanValue()) {
+ if (secureValidation != null && secureValidation) {
secVal = true;
}
@@ -281,13 +281,13 @@ public final class DOMReference extends
@Override
public byte[] getDigestValue() {
- return (digestValue == null ? null : (byte[])digestValue.clone());
+ return (digestValue == null ? null : digestValue.clone());
}
@Override
public byte[] getCalculatedDigestValue() {
return (calcDigestValue == null ? null
- : (byte[])calcDigestValue.clone());
+ : calcDigestValue.clone());
}
@Override
@@ -432,7 +432,7 @@ public final class DOMReference extends
DigesterOutputStream dos;
Boolean cache = (Boolean)
context.getProperty("javax.xml.crypto.dsig.cacheReference");
- if (cache != null && cache.booleanValue()) {
+ if (cache != null && cache) {
this.derefData = copyDerefData(dereferencedData);
dos = new DigesterOutputStream(md, true);
} else {
@@ -461,7 +461,7 @@ public final class DOMReference extends
if (!c14n11) {
Boolean prop = (Boolean)context.getProperty
("org.apache.xml.security.useC14N11");
- c14n11 = (prop != null && prop.booleanValue());
+ c14n11 = (prop != null && prop);
if (c14n11) {
c14nalg = "http://www.w3.org/2006/12/xml-c14n11";
}
@@ -525,7 +525,7 @@ public final class DOMReference extends
}
}
os.flush();
- if (cache != null && cache.booleanValue()) {
+ if (cache != null && cache) {
this.dis = dos.getInputStream();
}
return dos.getDigestValue();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java Sun Mar 24 15:47:32 2013
@@ -128,7 +128,7 @@ public final class DOMRetrievalMethod ex
Boolean secureValidation = (Boolean)
context.getProperty("org.apache.jcp.xml.dsig.secureValidation");
boolean secVal = false;
- if (secureValidation != null && secureValidation.booleanValue()) {
+ if (secureValidation != null && secureValidation) {
secVal = true;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java Sun Mar 24 15:47:32 2013
@@ -151,7 +151,7 @@ public final class DOMSignedInfo extends
Boolean secureValidation = (Boolean)
context.getProperty("org.apache.jcp.xml.dsig.secureValidation");
boolean secVal = false;
- if (secureValidation != null && secureValidation.booleanValue()) {
+ if (secureValidation != null && secureValidation) {
secVal = true;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java Sun Mar 24 15:47:32 2013
@@ -71,7 +71,7 @@ public class DOMURIDereferencer implemen
Boolean secureValidation = (Boolean)
context.getProperty("org.apache.jcp.xml.dsig.secureValidation");
boolean secVal = false;
- if (secureValidation != null && secureValidation.booleanValue()) {
+ if (secureValidation != null && secureValidation) {
secVal = true;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java Sun Mar 24 15:47:32 2013
@@ -254,7 +254,7 @@ public class DOMUtils {
}
@Override
public boolean hasNext() {
- return index < nl.getLength() ? true : false;
+ return index < nl.getLength();
}
};
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java Sun Mar 24 15:47:32 2013
@@ -497,7 +497,7 @@ public final class DOMXMLSignature exten
@Override
public byte[] getValue() {
- return (value == null) ? null : (byte[])value.clone();
+ return (value == null) ? null : value.clone();
}
public String getEncodedValue() {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java Sun Mar 24 15:47:32 2013
@@ -39,7 +39,6 @@ import javax.xml.crypto.dsig.keyinfo.X50
import org.apache.xml.security.utils.Base64;
import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -176,7 +175,7 @@ class Marshaller {
@Override
public void marshalObject(XmlWriter xwriter, PGPData toMarshal, String dsPrefix,
XMLCryptoContext context) throws MarshalException {
- Marshaller.marshalPGPData( xwriter, (PGPData) toMarshal, dsPrefix, context);
+ Marshaller.marshalPGPData( xwriter, toMarshal, dsPrefix, context);
}
};
@@ -294,7 +293,7 @@ class Marshaller {
xwriter.writeStartElement(node.getPrefix(), node.getLocalName(), node.getNamespaceURI());
// emit all the namespaces and attributes.
- NamedNodeMap nnm = ((Element)node).getAttributes();
+ NamedNodeMap nnm = node.getAttributes();
for (int idx = 0 ; idx < nnm.getLength() ; idx++) {
Attr attr = (Attr) nnm.item(idx);
// is this a namespace node?
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java Sun Mar 24 15:47:32 2013
@@ -54,8 +54,7 @@ public class Init {
/** The namespace for CONF file **/
public static final String CONF_NS = "http://www.xmlsecurity.org/NS/#configuration";
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(Init.class);
/** Field alreadyInitialized */
@@ -150,7 +149,6 @@ public class Init {
KeyResolver.registerDefaultResolvers();
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
- ex.printStackTrace();
}
}
@@ -356,7 +354,6 @@ public class Init {
}
} catch (Exception e) {
log.error("Bad: ", e);
- e.printStackTrace();
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/JCEMapper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/JCEMapper.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/JCEMapper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/JCEMapper.java Sun Mar 24 15:47:32 2013
@@ -31,8 +31,7 @@ import org.w3c.dom.Element;
*/
public class JCEMapper {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(JCEMapper.class);
private static Map<String, Algorithm> algorithmsMap =
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java Sun Mar 24 15:47:32 2013
@@ -46,8 +46,7 @@ import org.w3c.dom.Element;
*/
public class SignatureAlgorithm extends Algorithm {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(SignatureAlgorithm.class);
/** All available algorithm classes are registered here */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java Sun Mar 24 15:47:32 2013
@@ -40,8 +40,7 @@ import org.w3c.dom.Text;
public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(IntegrityHmac.class);
/** Field macAlgorithm */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java Sun Mar 24 15:47:32 2013
@@ -36,8 +36,7 @@ import org.apache.xml.security.signature
public abstract class SignatureBaseRSA extends SignatureAlgorithmSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(SignatureBaseRSA.class);
/** @inheritDoc */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java Sun Mar 24 15:47:32 2013
@@ -37,8 +37,7 @@ import org.apache.xml.security.utils.Con
public class SignatureDSA extends SignatureAlgorithmSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(SignatureDSA.class);
/** Field URI */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java Sun Mar 24 15:47:32 2013
@@ -43,8 +43,7 @@ import org.apache.xml.security.utils.Bas
*/
public abstract class SignatureECDSA extends SignatureAlgorithmSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(SignatureECDSA.class);
/** @inheritDoc */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java Sun Mar 24 15:47:32 2013
@@ -67,7 +67,7 @@ public abstract class Canonicalizer11 ex
int level;
boolean rendered = false;
List<Attr> nodes = new ArrayList<Attr>();
- };
+ }
int currentLevel = 0;
int lastlevel = 0;
@@ -180,7 +180,7 @@ public abstract class Canonicalizer11 ex
cur.rendered = true;
col.addAll(loa.values());
}
- };
+ }
private XmlAttrStack xmlattrStack = new XmlAttrStack();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java Sun Mar 24 15:47:32 2013
@@ -61,7 +61,7 @@ public abstract class Canonicalizer20010
int level;
boolean rendered = false;
List<Attr> nodes = new ArrayList<Attr>();
- };
+ }
int currentLevel = 0;
int lastlevel = 0;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java Sun Mar 24 15:47:32 2013
@@ -308,7 +308,7 @@ class NameSpaceSymbEntry implements Clon
return null;
}
}
-};
+}
class SymbMap implements Cloneable {
int free = 23;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java Sun Mar 24 15:47:32 2013
@@ -231,14 +231,20 @@ public abstract class AbstractSerializer
String nodeName = att.getNodeName();
if ((nodeName.equals("xmlns") || nodeName.startsWith("xmlns:"))
&& !storedNamespaces.containsKey(att.getNodeName())) {
- sb.append(" " + nodeName + "=\"" + att.getNodeValue() + "\"");
+ sb.append(" ");
+ sb.append(nodeName);
+ sb.append("=\"");
+ sb.append(att.getNodeValue());
+ sb.append("\"");
storedNamespaces.put(nodeName, att.getNodeValue());
}
}
}
wk = wk.getParentNode();
}
- sb.append(">" + source + "</dummy>");
+ sb.append(">");
+ sb.append(source);
+ sb.append("</dummy>");
return sb.toString();
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java Sun Mar 24 15:47:32 2013
@@ -277,7 +277,7 @@ public class XMLCipher {
* is defined in the <code>EncryptionMethod</code> element.
* @param provider the JCE provider that supplies the transformation,
* if null use the default provider.
- * @param canon the name of the c14n algorithm, if
+ * @param canonAlg the name of the c14n algorithm, if
* <code>null</code> use standard serializer
* @param digestMethod An optional digestMethod to use.
*/
@@ -805,14 +805,14 @@ public class XMLCipher {
log.debug("Encrypting element...");
}
if (null == element) {
- log.error("Element unexpectedly null...");
+ throw new XMLEncryptionException("empty", "Element unexpectedly null...");
}
- if (cipherMode != ENCRYPT_MODE && log.isDebugEnabled()) {
- log.debug("XMLCipher unexpectedly not in ENCRYPT_MODE...");
+ if (cipherMode != ENCRYPT_MODE) {
+ throw new XMLEncryptionException("empty", "XMLCipher unexpectedly not in ENCRYPT_MODE...");
}
if (algorithm == null) {
- throw new XMLEncryptionException("XMLCipher instance without transformation specified");
+ throw new XMLEncryptionException("empty", "XMLCipher instance without transformation specified");
}
encryptData(contextDocument, element, false);
@@ -843,14 +843,14 @@ public class XMLCipher {
log.debug("Encrypting element content...");
}
if (null == element) {
- log.error("Element unexpectedly null...");
+ throw new XMLEncryptionException("empty", "Element unexpectedly null...");
}
- if (cipherMode != ENCRYPT_MODE && log.isDebugEnabled()) {
- log.debug("XMLCipher unexpectedly not in ENCRYPT_MODE...");
+ if (cipherMode != ENCRYPT_MODE) {
+ throw new XMLEncryptionException("empty", "XMLCipher unexpectedly not in ENCRYPT_MODE...");
}
if (algorithm == null) {
- throw new XMLEncryptionException("XMLCipher instance without transformation specified");
+ throw new XMLEncryptionException("empty", "XMLCipher instance without transformation specified");
}
encryptData(contextDocument, element, true);
@@ -876,10 +876,10 @@ public class XMLCipher {
log.debug("Processing source document...");
}
if (null == context) {
- log.error("Context document unexpectedly null...");
+ throw new XMLEncryptionException("empty", "Context document unexpectedly null...");
}
if (null == source) {
- log.error("Source document unexpectedly null...");
+ throw new XMLEncryptionException("empty", "Source document unexpectedly null...");
}
contextDocument = context;
@@ -917,10 +917,10 @@ public class XMLCipher {
log.debug("Processing source element...");
}
if (null == context) {
- log.error("Context document unexpectedly null...");
+ throw new XMLEncryptionException("empty", "Context document unexpectedly null...");
}
if (null == element) {
- log.error("Source element unexpectedly null...");
+ throw new XMLEncryptionException("empty", "Source element unexpectedly null...");
}
contextDocument = context;
@@ -962,10 +962,11 @@ public class XMLCipher {
log.debug("Processing source element...");
}
if (null == context) {
- log.error("Context document unexpectedly null...");
+ throw new XMLEncryptionException("empty", "Context document unexpectedly null...");
}
if (null == element) {
- log.error("Source element unexpectedly null...");
+ throw new XMLEncryptionException("empty", "Source element unexpectedly null...");
+
}
contextDocument = context;
@@ -1035,13 +1036,13 @@ public class XMLCipher {
log.debug("Encrypting element...");
}
if (null == context) {
- log.error("Context document unexpectedly null...");
+ throw new XMLEncryptionException("empty", "Context document unexpectedly null...");
}
if (null == serializedData) {
- log.error("Serialized data unexpectedly null...");
+ throw new XMLEncryptionException("empty", "Serialized data unexpectedly null...");
}
- if (cipherMode != ENCRYPT_MODE && log.isDebugEnabled()) {
- log.debug("XMLCipher unexpectedly not in ENCRYPT_MODE...");
+ if (cipherMode != ENCRYPT_MODE) {
+ throw new XMLEncryptionException("empty", "XMLCipher unexpectedly not in ENCRYPT_MODE...");
}
return encryptData(context, null, type, serializedData);
@@ -1068,13 +1069,13 @@ public class XMLCipher {
log.debug("Encrypting element...");
}
if (null == context) {
- log.error("Context document unexpectedly null...");
+ throw new XMLEncryptionException("empty", "Context document unexpectedly null...");
}
if (null == element) {
- log.error("Element unexpectedly null...");
+ throw new XMLEncryptionException("empty", "Element unexpectedly null...");
}
- if (cipherMode != ENCRYPT_MODE && log.isDebugEnabled()) {
- log.debug("XMLCipher unexpectedly not in ENCRYPT_MODE...");
+ if (cipherMode != ENCRYPT_MODE) {
+ throw new XMLEncryptionException("empty", "XMLCipher unexpectedly not in ENCRYPT_MODE...");
}
if (contentMode) {
@@ -1090,7 +1091,7 @@ public class XMLCipher {
contextDocument = context;
if (algorithm == null) {
- throw new XMLEncryptionException("XMLCipher instance without transformation specified");
+ throw new XMLEncryptionException("empty", "XMLCipher instance without transformation specified");
}
byte[] serializedOctets = null;
@@ -1100,8 +1101,7 @@ public class XMLCipher {
if (null != children) {
serializedOctets = serializer.serializeToByteArray(children);
} else {
- Object exArgs[] = { "Element has no content." };
- throw new XMLEncryptionException("empty", exArgs);
+ throw new XMLEncryptionException("empty", "Element has no content.");
}
} else {
serializedOctets = serializer.serializeToByteArray(element);
@@ -1222,13 +1222,13 @@ public class XMLCipher {
log.debug("Loading encrypted element...");
}
if (null == context) {
- throw new NullPointerException("Context document unexpectedly null...");
+ throw new XMLEncryptionException("empty", "Context document unexpectedly null...");
}
if (null == element) {
- throw new NullPointerException("Element unexpectedly null...");
+ throw new XMLEncryptionException("empty", "Element unexpectedly null...");
}
if (cipherMode != DECRYPT_MODE) {
- throw new XMLEncryptionException("XMLCipher unexpectedly not in DECRYPT_MODE...");
+ throw new XMLEncryptionException("empty", "XMLCipher unexpectedly not in DECRYPT_MODE...");
}
contextDocument = context;
@@ -1253,13 +1253,13 @@ public class XMLCipher {
log.debug("Loading encrypted key...");
}
if (null == context) {
- throw new NullPointerException("Context document unexpectedly null...");
+ throw new XMLEncryptionException("empty", "Context document unexpectedly null...");
}
if (null == element) {
- throw new NullPointerException("Element unexpectedly null...");
+ throw new XMLEncryptionException("empty", "Context document unexpectedly null...");
}
if (cipherMode != UNWRAP_MODE && cipherMode != DECRYPT_MODE) {
- throw new XMLEncryptionException(
+ throw new XMLEncryptionException("empty",
"XMLCipher unexpectedly not in UNWRAP_MODE or DECRYPT_MODE..."
);
}
@@ -1319,13 +1319,13 @@ public class XMLCipher {
}
if (null == key) {
- log.error("Key unexpectedly null...");
+ throw new XMLEncryptionException("empty", "Key unexpectedly null...");
}
if (cipherMode != WRAP_MODE) {
- log.debug("XMLCipher unexpectedly not in WRAP_MODE...");
+ throw new XMLEncryptionException("empty", "XMLCipher unexpectedly not in WRAP_MODE...");
}
if (algorithm == null) {
- throw new XMLEncryptionException("XMLCipher instance without transformation specified");
+ throw new XMLEncryptionException("empty", "XMLCipher instance without transformation specified");
}
contextDocument = doc;
@@ -1399,11 +1399,11 @@ public class XMLCipher {
}
if (cipherMode != UNWRAP_MODE && log.isDebugEnabled()) {
- log.debug("XMLCipher unexpectedly not in UNWRAP_MODE...");
+ throw new XMLEncryptionException("empty", "XMLCipher unexpectedly not in UNWRAP_MODE...");
}
if (algorithm == null) {
- throw new XMLEncryptionException("Cannot decrypt a key without knowing the algorithm");
+ throw new XMLEncryptionException("empty", "Cannot decrypt a key without knowing the algorithm");
}
if (key == null) {
@@ -1431,7 +1431,7 @@ public class XMLCipher {
}
if (key == null) {
log.error("XMLCipher::decryptKey called without a KEK and cannot resolve");
- throw new XMLEncryptionException("Unable to decrypt without a KEK");
+ throw new XMLEncryptionException("empty", "Unable to decrypt without a KEK");
}
}
@@ -1606,7 +1606,7 @@ public class XMLCipher {
}
if (cipherMode != DECRYPT_MODE) {
- log.error("XMLCipher unexpectedly not in DECRYPT_MODE...");
+ throw new XMLEncryptionException("empty", "XMLCipher unexpectedly not in DECRYPT_MODE...");
}
byte[] octets = decryptToByteArray(element);
@@ -1644,7 +1644,7 @@ public class XMLCipher {
).item(0);
if (null == e) {
- throw new XMLEncryptionException("No EncryptedData child element.");
+ throw new XMLEncryptionException("empty", "No EncryptedData child element.");
}
return decryptElement(e);
@@ -1667,7 +1667,7 @@ public class XMLCipher {
}
if (cipherMode != DECRYPT_MODE) {
- log.error("XMLCipher unexpectedly not in DECRYPT_MODE...");
+ throw new XMLEncryptionException("empty", "XMLCipher unexpectedly not in DECRYPT_MODE...");
}
EncryptedData encryptedData = factory.newEncryptedData(element);
@@ -1699,7 +1699,7 @@ public class XMLCipher {
log.error(
"XMLCipher::decryptElement called without a key and unable to resolve"
);
- throw new XMLEncryptionException("encryption.nokey");
+ throw new XMLEncryptionException("empty", "encryption.nokey");
}
}
@@ -2272,7 +2272,6 @@ public class XMLCipher {
result.setKeyInfo(ki);
}
- // TODO: Implement
Element encryptionPropertiesElement =
(Element) element.getElementsByTagNameNS(
EncryptionConstants.EncryptionSpecNS,
@@ -2337,8 +2336,8 @@ public class XMLCipher {
EncryptionConstants._TAG_KEYSIZE).item(0);
if (null != keySizeElement) {
result.setKeySize(
- Integer.valueOf(
- keySizeElement.getFirstChild().getNodeValue()).intValue());
+ Integer.parseInt(
+ keySizeElement.getFirstChild().getNodeValue()));
}
Element oaepParamsElement =
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLEncryptionException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLEncryptionException.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLEncryptionException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLEncryptionException.java Sun Mar 24 15:47:32 2013
@@ -50,7 +50,7 @@ public class XMLEncryptionException exte
* @param msgID
* @param exArgs
*/
- public XMLEncryptionException(String msgID, Object exArgs[]) {
+ public XMLEncryptionException(String msgID, Object ... exArgs) {
super(msgID, exArgs);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java Sun Mar 24 15:47:32 2013
@@ -90,8 +90,7 @@ import org.w3c.dom.NodeList;
*/
public class KeyInfo extends SignatureElementProxy {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(KeyInfo.class);
// We need at least one StorageResolver otherwise
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java Sun Mar 24 15:47:32 2013
@@ -37,8 +37,7 @@ import org.w3c.dom.Node;
public class X509Data extends SignatureElementProxy implements KeyInfoContent {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(X509Data.class);
/**
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java Sun Mar 24 15:47:32 2013
@@ -30,8 +30,7 @@ import org.w3c.dom.Element;
public class XMLX509IssuerSerial extends SignatureElementProxy implements XMLX509DataContent {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(XMLX509IssuerSerial.class);
/**
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java Sun Mar 24 15:47:32 2013
@@ -36,8 +36,7 @@ import org.w3c.dom.Element;
*/
public class XMLX509SKI extends SignatureElementProxy implements XMLX509DataContent {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(XMLX509SKI.class);
/**
@@ -109,7 +108,7 @@ public class XMLX509SKI extends Signatur
throws XMLSecurityException {
if (cert.getVersion() < 3) {
- Object exArgs[] = { Integer.valueOf(cert.getVersion()) };
+ Object exArgs[] = { cert.getVersion() };
throw new XMLSecurityException("certificate.noSki.lowVersion", exArgs);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java Sun Mar 24 15:47:32 2013
@@ -47,8 +47,7 @@ import org.w3c.dom.Node;
*/
public class KeyResolver {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(KeyResolver.class);
/** Field resolverVector */
@@ -197,6 +196,8 @@ public class KeyResolver {
Exception ex = null;
try {
keyResolverSpi = (KeyResolverSpi) Class.forName(className).newInstance();
+ keyResolverSpi.setGlobalResolver(globalResolver);
+ register(keyResolverSpi, true);
} catch (ClassNotFoundException e) {
ex = e;
} catch (IllegalAccessException e) {
@@ -209,8 +210,6 @@ public class KeyResolver {
throw (IllegalArgumentException) new
IllegalArgumentException("Invalid KeyResolver class name").initCause(ex);
}
- keyResolverSpi.setGlobalResolver(globalResolver);
- register(keyResolverSpi, true);
}
/**
@@ -397,7 +396,7 @@ public class KeyResolver {
public void remove() {
throw new UnsupportedOperationException("Can't remove resolvers using the iterator");
}
- };
+ }
public static Iterator<KeyResolverSpi> iterator() {
return new ResolverIterator(resolverVector);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java Sun Mar 24 15:47:32 2013
@@ -80,7 +80,7 @@ public abstract class KeyResolverSpi {
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException {
throw new UnsupportedOperationException();
- };
+ }
/**
* Method engineLookupAndResolvePublicKey
@@ -130,7 +130,7 @@ public abstract class KeyResolverSpi {
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException{
throw new UnsupportedOperationException();
- };
+ }
/**
* Method engineLookupResolveX509Certificate
@@ -166,7 +166,7 @@ public abstract class KeyResolverSpi {
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException{
throw new UnsupportedOperationException();
- };
+ }
/**
* Method engineLookupAndResolveSecretKey
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java Sun Mar 24 15:47:32 2013
@@ -23,8 +23,7 @@ import org.w3c.dom.Element;
*/
public class DEREncodedKeyValueResolver extends KeyResolverSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(DEREncodedKeyValueResolver.class);
/** {@inheritDoc}. */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java Sun Mar 24 15:47:32 2013
@@ -31,8 +31,7 @@ import org.w3c.dom.Element;
public class DSAKeyValueResolver extends KeyResolverSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(DSAKeyValueResolver.class);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java Sun Mar 24 15:47:32 2013
@@ -49,8 +49,7 @@ import org.w3c.dom.Element;
*/
public class EncryptedKeyResolver extends KeyResolverSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(RSAKeyValueResolver.class);
private Key kek;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java?rev=1460408&r1=1460407&r2=1460408&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java Sun Mar 24 15:47:32 2013
@@ -37,8 +37,7 @@ import org.xml.sax.SAXException;
*/
public class KeyInfoReferenceResolver extends KeyResolverSpi {
- /** {@link org.apache.commons.logging} logging facility */
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(KeyInfoReferenceResolver.class);
/** {@inheritDoc}. */