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 2015/04/30 16:10:22 UTC
svn commit: r1676996 [1/2] - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/xml/security/algorithms/
main/java/org/apache/xml/security/algorithms/implementations/
main/java/org/apache/xml/security/c14n/ main/java/org/apache/xml/securit...
Author: coheigea
Date: Thu Apr 30 14:10:20 2015
New Revision: 1676996
URL: http://svn.apache.org/r1676996
Log:
Refactor of Exceptions
Modified:
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/CanonicalizationException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/InvalidCanonicalizerException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.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/exceptions/AlgorithmAlreadyRegisteredException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/Base64DecodingException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/XMLSecurityException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/ContentHandlerAlreadyRegisteredException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/DEREncodedKeyValue.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/RetrievalMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/InvalidKeyResolverException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverException.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/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/StorageResolverException.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/keys/storage/implementations/KeyStoreResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidDigestValueException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidSignatureValueException.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/MissingResourceFailureException.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/ReferenceNotInitializedException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignatureProperties.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/XMLSignatureException.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/ResourceResolverMapper.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConfigurationException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/algorithms/SignatureAlgorithmFactory.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEventReaderInputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenFactory.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/InvalidTransformException.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/TransformationException.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/TransformBase64Decode.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NExclusiveWithComments.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/implementations/TransformXPath2Filter.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXSLT.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/ResourceResolverException.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/ResolverLocalFilesystem.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java
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=1676996&r1=1676995&r2=1676996&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 Thu Apr 30 14:10:20 2015
@@ -151,13 +151,13 @@ public class SignatureAlgorithm extends
return implementingClass.newInstance();
} catch (IllegalAccessException ex) {
Object exArgs[] = { algorithmURI, ex.getMessage() };
- throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs, ex);
+ throw new XMLSignatureException(ex, "algorithms.NoSuchAlgorithm", exArgs);
} catch (InstantiationException ex) {
Object exArgs[] = { algorithmURI, ex.getMessage() };
- throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs, ex);
+ throw new XMLSignatureException(ex, "algorithms.NoSuchAlgorithm", exArgs);
} catch (NullPointerException ex) {
Object exArgs[] = { algorithmURI, ex.getMessage() };
- throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs, ex);
+ throw new XMLSignatureException(ex, "algorithms.NoSuchAlgorithm", exArgs);
}
}
@@ -345,7 +345,7 @@ public class SignatureAlgorithm extends
algorithmHash.put(algorithmURI, clazz);
} catch (NullPointerException ex) {
Object exArgs[] = { algorithmURI, ex.getMessage() };
- throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs, ex);
+ throw new XMLSignatureException(ex, "algorithms.NoSuchAlgorithm", exArgs);
}
}
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=1676996&r1=1676995&r2=1676996&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 Thu Apr 30 14:10:20 2015
@@ -121,7 +121,7 @@ public abstract class IntegrityHmac exte
return MessageDigestAlgorithm.isEqual(completeResult, signature);
}
} catch (IllegalStateException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -159,7 +159,7 @@ public abstract class IntegrityHmac exte
}
this.macAlgorithm = mac;
}
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -182,7 +182,7 @@ public abstract class IntegrityHmac exte
return this.macAlgorithm.doFinal();
}
} catch (IllegalStateException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -224,9 +224,9 @@ public abstract class IntegrityHmac exte
this.macAlgorithm.init(secretKey, algorithmParameterSpec);
}
} catch (InvalidKeyException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (InvalidAlgorithmParameterException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -253,7 +253,7 @@ public abstract class IntegrityHmac exte
try {
this.macAlgorithm.update(input);
} catch (IllegalStateException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -268,7 +268,7 @@ public abstract class IntegrityHmac exte
try {
this.macAlgorithm.update(input);
} catch (IllegalStateException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -285,7 +285,7 @@ public abstract class IntegrityHmac exte
try {
this.macAlgorithm.update(buf, offset, len);
} catch (IllegalStateException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
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=1676996&r1=1676995&r2=1676996&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 Thu Apr 30 14:10:20 2015
@@ -80,7 +80,7 @@ public abstract class SignatureBaseRSA e
try {
this.signatureAlgorithm.setParameter(params);
} catch (InvalidAlgorithmParameterException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -89,7 +89,7 @@ public abstract class SignatureBaseRSA e
try {
return this.signatureAlgorithm.verify(signature);
} catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -122,7 +122,7 @@ public abstract class SignatureBaseRSA e
}
this.signatureAlgorithm = sig;
}
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -131,7 +131,7 @@ public abstract class SignatureBaseRSA e
try {
return this.signatureAlgorithm.sign();
} catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -156,7 +156,7 @@ public abstract class SignatureBaseRSA e
this.signatureAlgorithm.initSign((PrivateKey) privateKey, secureRandom);
}
} catch (InvalidKeyException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -170,7 +170,7 @@ public abstract class SignatureBaseRSA e
try {
this.signatureAlgorithm.update(input);
} catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -179,7 +179,7 @@ public abstract class SignatureBaseRSA e
try {
this.signatureAlgorithm.update(input);
} catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -188,7 +188,7 @@ public abstract class SignatureBaseRSA e
try {
this.signatureAlgorithm.update(buf, offset, len);
} catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
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=1676996&r1=1676995&r2=1676996&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 Thu Apr 30 14:10:20 2015
@@ -93,7 +93,7 @@ public class SignatureDSA extends Signat
try {
this.signatureAlgorithm.setParameter(params);
} catch (InvalidAlgorithmParameterException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -112,9 +112,9 @@ public class SignatureDSA extends Signat
return this.signatureAlgorithm.verify(jcebytes);
} catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (IOException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -149,7 +149,7 @@ public class SignatureDSA extends Signat
}
this.signatureAlgorithm = sig;
}
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
size = ((DSAKey)publicKey).getParams().getQ().bitLength();
}
@@ -163,9 +163,9 @@ public class SignatureDSA extends Signat
return JavaUtils.convertDsaASN1toXMLDSIG(jcebytes, size/8);
} catch (IOException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -192,7 +192,7 @@ public class SignatureDSA extends Signat
this.signatureAlgorithm.initSign((PrivateKey) privateKey, secureRandom);
}
} catch (InvalidKeyException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
size = ((DSAKey)privateKey).getParams().getQ().bitLength();
}
@@ -211,7 +211,7 @@ public class SignatureDSA extends Signat
try {
this.signatureAlgorithm.update(input);
} catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -222,7 +222,7 @@ public class SignatureDSA extends Signat
try {
this.signatureAlgorithm.update(input);
} catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -233,7 +233,7 @@ public class SignatureDSA extends Signat
try {
this.signatureAlgorithm.update(buf, offset, len);
} catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
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=1676996&r1=1676995&r2=1676996&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 Thu Apr 30 14:10:20 2015
@@ -211,7 +211,7 @@ public abstract class SignatureECDSA ext
try {
this.signatureAlgorithm.setParameter(params);
} catch (InvalidAlgorithmParameterException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -226,9 +226,9 @@ public abstract class SignatureECDSA ext
return this.signatureAlgorithm.verify(jcebytes);
} catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (IOException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -262,7 +262,7 @@ public abstract class SignatureECDSA ext
}
this.signatureAlgorithm = sig;
}
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -273,9 +273,9 @@ public abstract class SignatureECDSA ext
return SignatureECDSA.convertASN1toXMLDSIG(jcebytes);
} catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (IOException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -300,7 +300,7 @@ public abstract class SignatureECDSA ext
this.signatureAlgorithm.initSign((PrivateKey) privateKey, secureRandom);
}
} catch (InvalidKeyException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -314,7 +314,7 @@ public abstract class SignatureECDSA ext
try {
this.signatureAlgorithm.update(input);
} catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -323,7 +323,7 @@ public abstract class SignatureECDSA ext
try {
this.signatureAlgorithm.update(input);
} catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -332,7 +332,7 @@ public abstract class SignatureECDSA ext
try {
this.signatureAlgorithm.update(buf, offset, len);
} catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizationException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizationException.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizationException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizationException.java Thu Apr 30 14:10:20 2015
@@ -62,23 +62,23 @@ public class CanonicalizationException e
/**
* Constructor CanonicalizationException
*
- * @param msgID
* @param originalException
+ * @param msgID
*/
- public CanonicalizationException(String msgID, Exception originalException) {
- super(msgID, originalException);
+ public CanonicalizationException(Exception originalException, String msgID) {
+ super(originalException, msgID);
}
/**
* Constructor CanonicalizationException
*
+ * @param originalException
* @param msgID
* @param exArgs
- * @param originalException
*/
public CanonicalizationException(
- String msgID, Object exArgs[], Exception originalException
+ Exception originalException, String msgID, Object exArgs[]
) {
- super(msgID, exArgs, originalException);
+ super(originalException, msgID, exArgs);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java Thu Apr 30 14:10:20 2015
@@ -117,7 +117,7 @@ public class Canonicalizer {
} catch (Exception e) {
Object exArgs[] = { algorithmURI };
throw new InvalidCanonicalizerException(
- "signature.Canonicalizer.UnknownCanonicalizer", exArgs, e
+ e, "signature.Canonicalizer.UnknownCanonicalizer", exArgs
);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/InvalidCanonicalizerException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/InvalidCanonicalizerException.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/InvalidCanonicalizerException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/InvalidCanonicalizerException.java Thu Apr 30 14:10:20 2015
@@ -57,23 +57,23 @@ public class InvalidCanonicalizerExcepti
/**
* Constructor InvalidCanonicalizerException
*
- * @param msgID
* @param originalException
+ * @param msgID
*/
- public InvalidCanonicalizerException(String msgID, Exception originalException) {
- super(msgID, originalException);
+ public InvalidCanonicalizerException(Exception originalException, String msgID) {
+ super(originalException, msgID);
}
/**
* Constructor InvalidCanonicalizerException
*
+ * @param originalException
* @param msgID
* @param exArgs
- * @param originalException
*/
public InvalidCanonicalizerException(
- String msgID, Object exArgs[], Exception originalException
+ Exception originalException, String msgID, Object exArgs[]
) {
- super(msgID, exArgs, originalException);
+ super(originalException, msgID, exArgs);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java Thu Apr 30 14:10:20 2015
@@ -158,13 +158,13 @@ public abstract class CanonicalizerBase
}
return null;
} catch (CanonicalizationException ex) {
- throw new CanonicalizationException("empty", ex);
+ throw new CanonicalizationException(ex, "empty");
} catch (ParserConfigurationException ex) {
- throw new CanonicalizationException("empty", ex);
+ throw new CanonicalizationException(ex, "empty");
} catch (IOException ex) {
- throw new CanonicalizationException("empty", ex);
+ throw new CanonicalizationException(ex, "empty");
} catch (SAXException ex) {
- throw new CanonicalizationException("empty", ex);
+ throw new CanonicalizationException(ex, "empty");
}
}
@@ -220,9 +220,9 @@ public abstract class CanonicalizerBase
return null;
} catch (UnsupportedEncodingException ex) {
- throw new CanonicalizationException("empty", ex);
+ throw new CanonicalizationException(ex, "empty");
} catch (IOException ex) {
- throw new CanonicalizationException("empty", ex);
+ throw new CanonicalizationException(ex, "empty");
}
}
@@ -369,9 +369,9 @@ public abstract class CanonicalizerBase
}
return null;
} catch (UnsupportedEncodingException ex) {
- throw new CanonicalizationException("empty", ex);
+ throw new CanonicalizationException(ex, "empty");
} catch (IOException ex) {
- throw new CanonicalizationException("empty", ex);
+ throw new CanonicalizationException(ex, "empty");
}
}
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=1676996&r1=1676995&r2=1676996&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 Thu Apr 30 14:10:20 2015
@@ -55,22 +55,20 @@ public class XMLEncryptionException exte
}
/**
- *
- * @param msgID
* @param originalException
+ * @param msgID
*/
- public XMLEncryptionException(String msgID, Exception originalException) {
- super(msgID, originalException);
+ public XMLEncryptionException(Exception originalException, String msgID) {
+ super(originalException, msgID);
}
/**
- *
+ * @param originalException
* @param msgID
* @param exArgs
- * @param originalException
*/
- public XMLEncryptionException(String msgID, Object exArgs[], Exception originalException) {
- super(msgID, exArgs, originalException);
+ public XMLEncryptionException(Exception originalException, String msgID, Object exArgs[]) {
+ super(originalException, msgID, exArgs);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/AlgorithmAlreadyRegisteredException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/AlgorithmAlreadyRegisteredException.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/AlgorithmAlreadyRegisteredException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/AlgorithmAlreadyRegisteredException.java Thu Apr 30 14:10:20 2015
@@ -54,24 +54,24 @@ public class AlgorithmAlreadyRegisteredE
/**
* Constructor AlgorithmAlreadyRegisteredException
*
- * @param msgID
* @param originalException
+ * @param msgID
*/
- public AlgorithmAlreadyRegisteredException(String msgID, Exception originalException) {
- super(msgID, originalException);
+ public AlgorithmAlreadyRegisteredException(Exception originalException, String msgID) {
+ super(originalException, msgID);
}
/**
* Constructor AlgorithmAlreadyRegisteredException
*
+ * @param originalException
* @param msgID
* @param exArgs
- * @param originalException
*/
public AlgorithmAlreadyRegisteredException(
- String msgID, Object exArgs[], Exception originalException
+ Exception originalException, String msgID, Object exArgs[]
) {
- super(msgID, exArgs, originalException);
+ super(originalException, msgID, exArgs);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/Base64DecodingException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/Base64DecodingException.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/Base64DecodingException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/Base64DecodingException.java Thu Apr 30 14:10:20 2015
@@ -57,22 +57,22 @@ public class Base64DecodingException ext
/**
* Constructor Base64DecodingException
*
- * @param msgID
* @param originalException
+ * @param msgID
*/
- public Base64DecodingException(String msgID, Exception originalException) {
- super(msgID, originalException);
+ public Base64DecodingException(Exception originalException, String msgID) {
+ super(originalException, msgID);
}
/**
* Constructor Base64DecodingException
*
+ * @param originalException
* @param msgID
* @param exArgs
- * @param originalException
*/
- public Base64DecodingException(String msgID, Object exArgs[], Exception originalException) {
- super(msgID, exArgs, originalException);
+ public Base64DecodingException(Exception originalException, String msgID, Object exArgs[]) {
+ super(originalException, msgID, exArgs);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/XMLSecurityException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/XMLSecurityException.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/XMLSecurityException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/XMLSecurityException.java Thu Apr 30 14:10:20 2015
@@ -91,7 +91,7 @@ public class XMLSecurityException extend
* @param msgID
* @param exArgs
*/
- public XMLSecurityException(String msgID, Object ... exArgs) {
+ public XMLSecurityException(String msgID, Object exArgs[]) {
super(MessageFormat.format(I18n.getExceptionMessage(msgID), exArgs));
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/ContentHandlerAlreadyRegisteredException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/ContentHandlerAlreadyRegisteredException.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/ContentHandlerAlreadyRegisteredException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/ContentHandlerAlreadyRegisteredException.java Thu Apr 30 14:10:20 2015
@@ -57,24 +57,24 @@ public class ContentHandlerAlreadyRegist
/**
* Constructor ContentHandlerAlreadyRegisteredException
*
- * @param msgID
* @param originalException
+ * @param msgID
*/
- public ContentHandlerAlreadyRegisteredException(String msgID, Exception originalException) {
- super(msgID, originalException);
+ public ContentHandlerAlreadyRegisteredException(Exception originalException, String msgID) {
+ super(originalException, msgID);
}
/**
* Constructor ContentHandlerAlreadyRegisteredException
*
+ * @param originalException
* @param msgID
* @param exArgs
- * @param originalException
*/
public ContentHandlerAlreadyRegisteredException(
- String msgID, Object exArgs[], Exception originalException
+ Exception originalException, String msgID, Object exArgs[]
) {
- super(msgID, exArgs, originalException);
+ super(originalException, msgID, exArgs);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/DEREncodedKeyValue.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/DEREncodedKeyValue.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/DEREncodedKeyValue.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/DEREncodedKeyValue.java Thu Apr 30 14:10:20 2015
@@ -139,10 +139,10 @@ public class DEREncodedKeyValue extends
return keySpec.getEncoded();
} catch (NoSuchAlgorithmException e) {
Object exArgs[] = { publicKey.getAlgorithm(), publicKey.getFormat(), publicKey.getClass().getName() };
- throw new XMLSecurityException("DEREncodedKeyValue.UnsupportedPublicKey", exArgs, e);
+ throw new XMLSecurityException(e, "DEREncodedKeyValue.UnsupportedPublicKey", exArgs);
} catch (InvalidKeySpecException e) {
Object exArgs[] = { publicKey.getAlgorithm(), publicKey.getFormat(), publicKey.getClass().getName() };
- throw new XMLSecurityException("DEREncodedKeyValue.UnsupportedPublicKey", exArgs, e);
+ throw new XMLSecurityException(e, "DEREncodedKeyValue.UnsupportedPublicKey", exArgs);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/RetrievalMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/RetrievalMethod.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/RetrievalMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/RetrievalMethod.java Thu Apr 30 14:10:20 2015
@@ -120,7 +120,7 @@ public class RetrievalMethod extends Sig
return null;
} catch (XMLSignatureException ex) {
- throw new XMLSecurityException("empty", ex);
+ throw new XMLSecurityException(ex, "empty");
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java Thu Apr 30 14:10:20 2015
@@ -115,9 +115,9 @@ public class DSAKeyValue extends Signatu
return pk;
} catch (NoSuchAlgorithmException ex) {
- throw new XMLSecurityException("empty", ex);
+ throw new XMLSecurityException(ex, "empty");
} catch (InvalidKeySpecException ex) {
- throw new XMLSecurityException("empty", ex);
+ throw new XMLSecurityException(ex, "empty");
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java Thu Apr 30 14:10:20 2015
@@ -106,9 +106,9 @@ public class RSAKeyValue extends Signatu
return pk;
} catch (NoSuchAlgorithmException ex) {
- throw new XMLSecurityException("empty", ex);
+ throw new XMLSecurityException(ex, "empty");
} catch (InvalidKeySpecException ex) {
- throw new XMLSecurityException("empty", ex);
+ throw new XMLSecurityException(ex, "empty");
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java Thu Apr 30 14:10:20 2015
@@ -73,7 +73,7 @@ public class XMLX509Certificate extends
try {
this.addBase64Text(x509certificate.getEncoded());
} catch (java.security.cert.CertificateEncodingException ex) {
- throw new XMLSecurityException("empty", ex);
+ throw new XMLSecurityException(ex, "empty");
}
}
@@ -109,7 +109,7 @@ public class XMLX509Certificate extends
return null;
} catch (CertificateException ex) {
- throw new XMLSecurityException("empty", ex);
+ throw new XMLSecurityException(ex, "empty");
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/InvalidKeyResolverException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/InvalidKeyResolverException.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/InvalidKeyResolverException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/InvalidKeyResolverException.java Thu Apr 30 14:10:20 2015
@@ -57,21 +57,21 @@ public class InvalidKeyResolverException
/**
* Constructor InvalidKeyResolverException
*
- * @param msgID
* @param originalException
+ * @param msgID
*/
- public InvalidKeyResolverException(String msgID, Exception originalException) {
- super(msgID, originalException);
+ public InvalidKeyResolverException(Exception originalException, String msgID) {
+ super(originalException, msgID);
}
/**
* Constructor InvalidKeyResolverException
*
+ * @param originalException
* @param msgID
* @param exArgs
- * @param originalException
*/
- public InvalidKeyResolverException(String msgID, Object exArgs[], Exception originalException) {
- super(msgID, exArgs, originalException);
+ public InvalidKeyResolverException(Exception originalException, String msgID, Object exArgs[]) {
+ super(originalException, msgID, exArgs);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverException.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverException.java Thu Apr 30 14:10:20 2015
@@ -57,21 +57,21 @@ public class KeyResolverException extend
/**
* Constructor KeyResolverException
*
- * @param msgID
* @param originalException
+ * @param msgID
*/
- public KeyResolverException(String msgID, Exception originalException) {
- super(msgID, originalException);
+ public KeyResolverException(Exception originalException, String msgID) {
+ super(originalException, msgID);
}
/**
* Constructor KeyResolverException
*
+ * @param originalException
* @param msgID
* @param exArgs
- * @param originalException
*/
- public KeyResolverException(String msgID, Object exArgs[], Exception originalException) {
- super(msgID, exArgs, originalException);
+ public KeyResolverException(Exception originalException, String msgID, Object exArgs[]) {
+ super(originalException, msgID, exArgs);
}
}
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=1676996&r1=1676995&r2=1676996&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 Thu Apr 30 14:10:20 2015
@@ -115,9 +115,9 @@ public abstract class KeyResolverSpi {
try {
tmp = getClass().newInstance();
} catch (InstantiationException e) {
- throw new KeyResolverException("", e);
+ throw new KeyResolverException(e, "");
} catch (IllegalAccessException e) {
- throw new KeyResolverException("", e);
+ throw new KeyResolverException(e, "");
}
}
return tmp;
@@ -276,11 +276,11 @@ public abstract class KeyResolverSpi {
Document doc = db.parse(new ByteArrayInputStream(bytes));
return doc.getDocumentElement();
} catch (SAXException ex) {
- throw new KeyResolverException("empty", ex);
+ throw new KeyResolverException(ex, "empty");
} catch (IOException ex) {
- throw new KeyResolverException("empty", ex);
+ throw new KeyResolverException(ex, "empty");
} catch (ParserConfigurationException ex) {
- throw new KeyResolverException("empty", ex);
+ throw new KeyResolverException(ex, "empty");
} finally {
if (db != null) {
XMLUtils.repoolDocumentBuilder(db);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java Thu Apr 30 14:10:20 2015
@@ -102,7 +102,7 @@ public class X509CertificateResolver ext
if (log.isDebugEnabled()) {
log.debug("XMLSecurityException", ex);
}
- throw new KeyResolverException("generic.EmptyMessage", ex);
+ throw new KeyResolverException(ex, "generic.EmptyMessage");
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java Thu Apr 30 14:10:20 2015
@@ -151,7 +151,7 @@ public class X509DigestResolver extends
}
} catch (XMLSecurityException ex) {
- throw new KeyResolverException("empty", ex);
+ throw new KeyResolverException(ex, "empty");
}
return null;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java Thu Apr 30 14:10:20 2015
@@ -132,7 +132,7 @@ public class X509IssuerSerialResolver ex
log.debug("XMLSecurityException", ex);
}
- throw new KeyResolverException("generic.EmptyMessage", ex);
+ throw new KeyResolverException(ex, "generic.EmptyMessage");
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java Thu Apr 30 14:10:20 2015
@@ -130,7 +130,7 @@ public class X509SKIResolver extends Key
}
}
} catch (XMLSecurityException ex) {
- throw new KeyResolverException("empty", ex);
+ throw new KeyResolverException(ex, "empty");
}
return null;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java Thu Apr 30 14:10:20 2015
@@ -150,7 +150,7 @@ public class X509SubjectNameResolver ext
log.debug("XMLSecurityException", ex);
}
- throw new KeyResolverException("generic.EmptyMessage", ex);
+ throw new KeyResolverException(ex, "generic.EmptyMessage");
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolverException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolverException.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolverException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolverException.java Thu Apr 30 14:10:20 2015
@@ -58,22 +58,21 @@ public class StorageResolverException ex
/**
* Constructor StorageResolverException
*
- * @param msgID
* @param originalException
+ * @param msgID
*/
- public StorageResolverException(String msgID, Exception originalException) {
- super(msgID, originalException);
+ public StorageResolverException(Exception originalException, String msgID) {
+ super(originalException, msgID);
}
/**
* Constructor StorageResolverException
*
+ * @param originalException
* @param msgID
* @param exArgs
- * @param originalException
*/
- public StorageResolverException(String msgID, Object exArgs[],
- Exception originalException) {
- super(msgID, exArgs, originalException);
+ public StorageResolverException(Exception originalException, String msgID, Object exArgs[]) {
+ super(originalException, msgID, exArgs);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java Thu Apr 30 14:10:20 2015
@@ -89,7 +89,7 @@ public class CertsInFilesystemDirectoryR
try {
cf = CertificateFactory.getInstance("X.509");
} catch (CertificateException ex) {
- throw new StorageResolverException("empty", ex);
+ throw new StorageResolverException(ex, "empty");
}
if (cf == null) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/KeyStoreResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/KeyStoreResolver.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/KeyStoreResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/KeyStoreResolver.java Thu Apr 30 14:10:20 2015
@@ -49,7 +49,7 @@ public class KeyStoreResolver extends St
try {
keyStore.aliases();
} catch (KeyStoreException ex) {
- throw new StorageResolverException("generic.EmptyMessage", ex);
+ throw new StorageResolverException(ex, "generic.EmptyMessage");
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidDigestValueException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidDigestValueException.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidDigestValueException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidDigestValueException.java Thu Apr 30 14:10:20 2015
@@ -62,21 +62,21 @@ public class InvalidDigestValueException
/**
* Constructor InvalidDigestValueException
*
- * @param msgID
* @param originalException
+ * @param msgID
*/
- public InvalidDigestValueException(String msgID, Exception originalException) {
- super(msgID, originalException);
+ public InvalidDigestValueException(Exception originalException, String msgID) {
+ super(originalException, msgID);
}
/**
* Constructor InvalidDigestValueException
*
+ * @param originalException
* @param msgID
* @param exArgs
- * @param originalException
*/
- public InvalidDigestValueException(String msgID, Object exArgs[], Exception originalException) {
- super(msgID, exArgs, originalException);
+ public InvalidDigestValueException(Exception originalException, String msgID, Object exArgs[]) {
+ super(originalException, msgID, exArgs);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidSignatureValueException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidSignatureValueException.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidSignatureValueException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidSignatureValueException.java Thu Apr 30 14:10:20 2015
@@ -61,21 +61,21 @@ public class InvalidSignatureValueExcept
/**
* Constructor InvalidSignatureValueException
*
- * @param msgID
* @param originalException
+ * @param msgID
*/
- public InvalidSignatureValueException(String msgID, Exception originalException) {
- super(msgID, originalException);
+ public InvalidSignatureValueException(Exception originalException, String msgID) {
+ super(originalException, msgID);
}
/**
* Constructor InvalidSignatureValueException
*
+ * @param originalException
* @param msgID
* @param exArgs
- * @param originalException
*/
- public InvalidSignatureValueException(String msgID, Object exArgs[], Exception originalException) {
- super(msgID, exArgs, originalException);
+ public InvalidSignatureValueException(Exception originalException, String msgID, Object exArgs[]) {
+ super(originalException, msgID, exArgs);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java Thu Apr 30 14:10:20 2015
@@ -380,7 +380,7 @@ public class Manifest extends SignatureE
if (referencedManifest == null) {
// The Reference stated that it points to a ds:Manifest
// but we did not find a ds:Manifest in the signed area
- throw new MissingResourceFailureException("empty", currentRef);
+ throw new MissingResourceFailureException(currentRef, "empty");
}
referencedManifest.perManifestResolvers = this.perManifestResolvers;
@@ -399,18 +399,18 @@ public class Manifest extends SignatureE
}
}
} catch (IOException ex) {
- throw new ReferenceNotInitializedException("empty", ex);
+ throw new ReferenceNotInitializedException(ex, "empty");
} catch (ParserConfigurationException ex) {
- throw new ReferenceNotInitializedException("empty", ex);
+ throw new ReferenceNotInitializedException(ex, "empty");
} catch (SAXException ex) {
- throw new ReferenceNotInitializedException("empty", ex);
+ throw new ReferenceNotInitializedException(ex, "empty");
}
}
} catch (ReferenceNotInitializedException ex) {
Object exArgs[] = { currentRef.getURI() };
throw new MissingResourceFailureException(
- "signature.Verification.Reference.NoInput", exArgs, ex, currentRef
+ ex, currentRef, "signature.Verification.Reference.NoInput", exArgs
);
}
}
@@ -449,14 +449,14 @@ public class Manifest extends SignatureE
I18n.translate("signature.Verification.IndexOutOfBounds", exArgs)
);
- throw new XMLSecurityException("generic.EmptyMessage", e);
+ throw new XMLSecurityException(e, "generic.EmptyMessage");
}
if (this.verificationResults == null) {
try {
this.verifyReferences();
} catch (Exception ex) {
- throw new XMLSecurityException("generic.EmptyMessage", ex);
+ throw new XMLSecurityException(ex, "generic.EmptyMessage");
}
}
@@ -549,13 +549,13 @@ public class Manifest extends SignatureE
try {
return this.getReferencedContentAfterTransformsItem(i).getBytes();
} catch (IOException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (CanonicalizationException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (InvalidCanonicalizerException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (XMLSecurityException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/MissingResourceFailureException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/MissingResourceFailureException.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/MissingResourceFailureException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/MissingResourceFailureException.java Thu Apr 30 14:10:20 2015
@@ -38,11 +38,11 @@ public class MissingResourceFailureExcep
/**
* MissingKeyResourceFailureException constructor.
- * @param msgID
* @param reference
+ * @param msgID
* @see #getReference
*/
- public MissingResourceFailureException(String msgID, Reference reference) {
+ public MissingResourceFailureException(Reference reference, String msgID) {
super(msgID);
this.uninitializedReference = reference;
@@ -51,12 +51,12 @@ public class MissingResourceFailureExcep
/**
* Constructor MissingResourceFailureException
*
+ * @param reference
* @param msgID
* @param exArgs
- * @param reference
* @see #getReference
*/
- public MissingResourceFailureException(String msgID, Object exArgs[], Reference reference) {
+ public MissingResourceFailureException(Reference reference, String msgID, Object exArgs[]) {
super(msgID, exArgs);
this.uninitializedReference = reference;
@@ -65,15 +65,15 @@ public class MissingResourceFailureExcep
/**
* Constructor MissingResourceFailureException
*
- * @param msgID
* @param originalException
* @param reference
+ * @param msgID
* @see #getReference
*/
public MissingResourceFailureException(
- String msgID, Exception originalException, Reference reference
+ Exception originalException, Reference reference, String msgID
) {
- super(msgID, originalException);
+ super(originalException, msgID);
this.uninitializedReference = reference;
}
@@ -81,16 +81,16 @@ public class MissingResourceFailureExcep
/**
* Constructor MissingResourceFailureException
*
- * @param msgID
- * @param exArgs
* @param originalException
* @param reference
+ * @param msgID
+ * @param exArgs
* @see #getReference
*/
public MissingResourceFailureException(
- String msgID, Object exArgs[], Exception originalException, Reference reference
+ Exception originalException, Reference reference, String msgID, Object exArgs[]
) {
- super(msgID, exArgs, originalException);
+ super(originalException, msgID, exArgs);
this.uninitializedReference = reference;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java Thu Apr 30 14:10:20 2015
@@ -425,7 +425,7 @@ public class Reference extends Signature
return resolver.resolve(uriAttr, this.baseURI, secureValidation);
} catch (ResourceResolverException ex) {
- throw new ReferenceNotInitializedException("empty", ex);
+ throw new ReferenceNotInitializedException(ex, "empty");
}
}
@@ -447,15 +447,15 @@ public class Reference extends Signature
return output;
} catch (ResourceResolverException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (CanonicalizationException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (InvalidCanonicalizerException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (TransformationException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (XMLSecurityException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -506,17 +506,17 @@ public class Reference extends Signature
}
return output;
} catch (IOException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (ResourceResolverException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (CanonicalizationException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (InvalidCanonicalizerException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (TransformationException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (XMLSecurityException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -567,11 +567,11 @@ public class Reference extends Signature
return nodes.getHTMLRepresentation(inclusiveNamespaces);
} catch (TransformationException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (InvalidTransformException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (XMLSecurityException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -610,7 +610,7 @@ public class Reference extends Signature
this.transformsOutput = output;
return output;
} catch (XMLSecurityException ex) {
- throw new ReferenceNotInitializedException("empty", ex);
+ throw new ReferenceNotInitializedException(ex, "empty");
}
}
@@ -691,9 +691,9 @@ public class Reference extends Signature
XMLSignatureInput output = this.dereferenceURIandPerformTransforms(null);
return output.getBytes();
} catch (IOException ex) {
- throw new ReferenceNotInitializedException("empty", ex);
+ throw new ReferenceNotInitializedException(ex, "empty");
} catch (CanonicalizationException ex) {
- throw new ReferenceNotInitializedException("empty", ex);
+ throw new ReferenceNotInitializedException(ex, "empty");
}
}
@@ -741,15 +741,15 @@ public class Reference extends Signature
return diOs.getDigestValue();
} catch (XMLSecurityException ex) {
- throw new ReferenceNotInitializedException("empty", ex);
+ throw new ReferenceNotInitializedException(ex, "empty");
} catch (IOException ex) {
- throw new ReferenceNotInitializedException("empty", ex);
+ throw new ReferenceNotInitializedException(ex, "empty");
} finally {
if (os != null) {
try {
os.close();
} catch (IOException ex) {
- throw new ReferenceNotInitializedException("empty", ex);
+ throw new ReferenceNotInitializedException(ex, "empty");
}
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/ReferenceNotInitializedException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/ReferenceNotInitializedException.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/ReferenceNotInitializedException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/ReferenceNotInitializedException.java Thu Apr 30 14:10:20 2015
@@ -61,21 +61,21 @@ public class ReferenceNotInitializedExce
/**
* Constructor ReferenceNotInitializedException
*
- * @param msgID
* @param originalException
+ * @param msgID
*/
- public ReferenceNotInitializedException(String msgID, Exception originalException) {
- super(msgID, originalException);
+ public ReferenceNotInitializedException(Exception originalException, String msgID) {
+ super(originalException, msgID);
}
/**
* Constructor ReferenceNotInitializedException
*
+ * @param originalException
* @param msgID
* @param exArgs
- * @param originalException
*/
- public ReferenceNotInitializedException(String msgID, Object exArgs[], Exception originalException) {
- super(msgID, exArgs, originalException);
+ public ReferenceNotInitializedException(Exception originalException, String msgID, Object exArgs[]) {
+ super(originalException, msgID, exArgs);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignatureProperties.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignatureProperties.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignatureProperties.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignatureProperties.java Thu Apr 30 14:10:20 2015
@@ -102,7 +102,7 @@ public class SignatureProperties extends
}
return new SignatureProperty(propertyElem, this.baseURI);
} catch (XMLSecurityException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignedInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignedInfo.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignedInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignedInfo.java Thu Apr 30 14:10:20 2015
@@ -224,11 +224,11 @@ public class SignedInfo extends Manifest
XMLUtils.repoolDocumentBuilder(db);
}
} catch (ParserConfigurationException ex) {
- throw new XMLSecurityException("empty", ex);
+ throw new XMLSecurityException(ex, "empty");
} catch (IOException ex) {
- throw new XMLSecurityException("empty", ex);
+ throw new XMLSecurityException(ex, "empty");
} catch (SAXException ex) {
- throw new XMLSecurityException("empty", ex);
+ throw new XMLSecurityException(ex, "empty");
}
}
return element;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java Thu Apr 30 14:10:20 2015
@@ -488,7 +488,7 @@ public final class XMLSignature extends
try {
return Base64.decode(signatureValueElement);
} catch (Base64DecodingException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -651,11 +651,11 @@ public final class XMLSignature extends
} catch (XMLSignatureException ex) {
throw ex;
} catch (CanonicalizationException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (InvalidCanonicalizerException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} catch (XMLSecurityException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
@@ -765,7 +765,7 @@ public final class XMLSignature extends
} catch (XMLSignatureException ex) {
throw ex;
} catch (XMLSecurityException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureException.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureException.java Thu Apr 30 14:10:20 2015
@@ -63,21 +63,21 @@ public class XMLSignatureException exten
/**
* Constructor XMLSignatureException
*
- * @param msgID
* @param originalException
+ * @param msgID
*/
- public XMLSignatureException(String msgID, Exception originalException) {
- super(msgID, originalException);
+ public XMLSignatureException(Exception originalException, String msgID) {
+ super(originalException, msgID);
}
/**
* Constructor XMLSignatureException
*
+ * @param originalException
* @param msgID
* @param exArgs
- * @param originalException
*/
- public XMLSignatureException(String msgID, Object exArgs[], Exception originalException) {
- super(msgID, exArgs, originalException);
+ public XMLSignatureException(Exception originalException, String msgID, Object exArgs[]) {
+ super(originalException, msgID, exArgs);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java Thu Apr 30 14:10:20 2015
@@ -158,7 +158,7 @@ public class XMLSignatureInputDebugger {
return this.writer.toString();
} catch (IOException ex) {
- throw new XMLSignatureException("empty", ex);
+ throw new XMLSignatureException(ex, "empty");
} finally {
this.xpathNodeSet = null;
this.writer = null;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java Thu Apr 30 14:10:20 2015
@@ -58,6 +58,6 @@ public class ResourceResolverMapper {
return rr.newInstance(uri, baseURI);
}
}
- throw new XMLSecurityException("utils.resolver.noClass", uri, baseURI);
+ throw new XMLSecurityException("utils.resolver.noClass", new Object[]{uri, baseURI});
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java Thu Apr 30 14:10:20 2015
@@ -83,7 +83,8 @@ public class TransformerAlgorithmMapper
clazz = algorithmsClassMapInOut.get(algoURI);
}
if (clazz == null) {
- throw new XMLSecurityException("signature.Transform.UnknownTransform", algoURI);
+ throw new XMLSecurityException("signature.Transform.UnknownTransform",
+ new Object[] {algoURI});
}
return clazz;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConfigurationException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConfigurationException.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConfigurationException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConfigurationException.java Thu Apr 30 14:10:20 2015
@@ -45,7 +45,7 @@ public class XMLSecurityConfigurationExc
super(msgID, exArgs);
}
- public XMLSecurityConfigurationException(String msgID, Exception originalException) {
- super(msgID, originalException);
+ public XMLSecurityConfigurationException(Exception originalException, String msgID) {
+ super(originalException, msgID);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java Thu Apr 30 14:10:20 2015
@@ -84,7 +84,7 @@ public class XMLSecurityConstants {
SECURE_RANDOM.nextBytes(temp);
return temp;
} catch (Exception ex) {
- throw new XMLSecurityException("Error in generating nonce of length " + length, ex);
+ throw new XMLSecurityException(ex);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java Thu Apr 30 14:10:20 2015
@@ -261,7 +261,8 @@ public class XMLSecurityUtils {
// SKI can only be used for a V3 certificate
int version = x509Certificates[0].getVersion();
if (version != 3) {
- throw new XMLSecurityException("certificate.noSki.lowVersion", version);
+ throw new XMLSecurityException("certificate.noSki.lowVersion",
+ new Object[]{version});
}
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509Data, true, null);
@@ -358,7 +359,8 @@ public class XMLSecurityUtils {
} else if (SecurityTokenConstants.EncryptedKeyToken.equals(tokenType)) {
tokenSecurityEvent = new EncryptedKeyTokenSecurityEvent();
} else {
- throw new XMLSecurityException("stax.unsupportedToken", tokenType);
+ throw new XMLSecurityException("stax.unsupportedToken",
+ new Object[]{tokenType});
}
tokenSecurityEvent.setSecurityToken(inboundSecurityToken);
tokenSecurityEvent.setCorrelationID(correlationID);