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 [2/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...
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/algorithms/SignatureAlgorithmFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/algorithms/SignatureAlgorithmFactory.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/algorithms/SignatureAlgorithmFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/algorithms/SignatureAlgorithmFactory.java Thu Apr 30 14:10:20 2015
@@ -45,7 +45,8 @@ public class SignatureAlgorithmFactory {
public SignatureAlgorithm getSignatureAlgorithm(String algoURI) throws XMLSecurityException, NoSuchProviderException, NoSuchAlgorithmException {
String algorithmClass = JCEAlgorithmMapper.getAlgorithmClassFromURI(algoURI);
if (algorithmClass == null) {
- throw new XMLSecurityException("algorithms.NoSuchMap", algoURI);
+ throw new XMLSecurityException("algorithms.NoSuchMap",
+ new Object[] {algoURI});
}
String jceName = JCEAlgorithmMapper.translateURItoJCEID(algoURI);
String jceProvider = JCEAlgorithmMapper.getJCEProviderFromURI(algoURI);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java Thu Apr 30 14:10:20 2015
@@ -378,7 +378,8 @@ public abstract class AbstractDecryptInp
String jceName = JCEAlgorithmMapper.translateURItoJCEID(algorithmURI);
String jceProvider = JCEAlgorithmMapper.getJCEProviderFromURI(algorithmURI);
if (jceName == null) {
- throw new XMLSecurityException("algorithms.NoSuchMap", algorithmURI);
+ throw new XMLSecurityException("algorithms.NoSuchMap",
+ new Object[] {algorithmURI});
}
if (jceProvider != null) {
symCipher = Cipher.getInstance(jceName, jceProvider);
@@ -444,7 +445,8 @@ public abstract class AbstractDecryptInp
xmlSecEvents.push(encryptedDataXMLSecEvent);
if (++count >= maximumAllowedEncryptedDataEvents) {
- throw new XMLSecurityException("stax.xmlStructureSizeExceeded", maximumAllowedEncryptedDataEvents);
+ throw new XMLSecurityException("stax.xmlStructureSizeExceeded",
+ new Object[] {maximumAllowedEncryptedDataEvents});
}
//the keyInfoCount is necessary to prevent early while-loop abort when the KeyInfo also contains a CipherValue.
@@ -613,9 +615,9 @@ public abstract class AbstractDecryptInp
case XMLStreamConstants.START_ELEMENT:
currentXMLStructureDepth++;
if (currentXMLStructureDepth > maximumAllowedXMLStructureDepth) {
- throw new XMLSecurityException(
+ throw new XMLSecurityException(
"secureProcessing.MaximumAllowedXMLStructureDepth",
- maximumAllowedXMLStructureDepth
+ new Object[] {maximumAllowedXMLStructureDepth}
);
}
@@ -805,7 +807,7 @@ public abstract class AbstractDecryptInp
default:
throw new XMLSecurityException(
"stax.unexpectedXMLEvent",
- XMLSecurityUtils.getXMLEventAsString(xmlSecEvent)
+ new Object[] {XMLSecurityUtils.getXMLEventAsString(xmlSecEvent)}
);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java Thu Apr 30 14:10:20 2015
@@ -86,8 +86,7 @@ public abstract class AbstractSignatureR
if (referencesTypeList.size() > maximumAllowedReferencesPerManifest) {
throw new XMLSecurityException(
"secureProcessing.MaximumAllowedReferencesPerManifest",
- referencesTypeList.size(),
- maximumAllowedReferencesPerManifest);
+ new Object[] {referencesTypeList.size(), maximumAllowedReferencesPerManifest});
}
sameDocumentReferences = new ArrayList<KeyValue<ResourceResolver, ReferenceType>>(referencesTypeList.size());
externalReferences = new ArrayList<KeyValue<ResourceResolver, ReferenceType>>(referencesTypeList.size());
@@ -156,7 +155,8 @@ public abstract class AbstractSignatureR
ReferenceType referenceType = referenceTypes.get(i);
if (processedReferences.contains(referenceType)) {
- throw new XMLSecurityException("signature.Verification.MultipleIDs", referenceType.getURI());
+ throw new XMLSecurityException("signature.Verification.MultipleIDs",
+ new Object[] {referenceType.getURI()});
}
InternalSignatureReferenceVerifier internalSignatureReferenceVerifier =
getSignatureReferenceVerifier(getSecurityProperties(), inputProcessorChain,
@@ -271,7 +271,8 @@ public abstract class AbstractSignatureR
String jceName = JCEAlgorithmMapper.translateURItoJCEID(digestMethodAlgorithm);
String jceProvider = JCEAlgorithmMapper.getJCEProviderFromURI(digestMethodAlgorithm);
if (jceName == null) {
- throw new XMLSecurityException("algorithms.NoSuchMap", digestMethodAlgorithm);
+ throw new XMLSecurityException("algorithms.NoSuchMap",
+ new Object[] {digestMethodAlgorithm});
}
AlgorithmSuiteSecurityEvent algorithmSuiteSecurityEvent = new AlgorithmSuiteSecurityEvent();
@@ -327,8 +328,7 @@ public abstract class AbstractSignatureR
if (transformTypeList.size() > maximumAllowedTransformsPerReference) {
throw new XMLSecurityException(
"secureProcessing.MaximumAllowedTransformsPerReference",
- transformTypeList.size(),
- maximumAllowedTransformsPerReference);
+ new Object[] {transformTypeList.size(), maximumAllowedTransformsPerReference});
}
Transformer parentTransformer = null;
@@ -375,7 +375,8 @@ public abstract class AbstractSignatureR
if (!MessageDigest.isEqual(referenceType.getDigestValue(), calculatedDigest)) {
throw new XMLSecurityException(
- "signature.Verification.InvalidDigestOrReference", referenceType.getURI());
+ "signature.Verification.InvalidDigestOrReference",
+ new Object[] {referenceType.getURI()});
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java Thu Apr 30 14:10:20 2015
@@ -161,7 +161,8 @@ public class XMLEncryptedKeyInputHandler
String jceName = JCEAlgorithmMapper.translateURItoJCEID(algorithmURI);
String jceProvider = JCEAlgorithmMapper.getJCEProviderFromURI(algorithmURI);
if (jceName == null) {
- throw new XMLSecurityException("algorithms.NoSuchMap", algorithmURI);
+ throw new XMLSecurityException("algorithms.NoSuchMap",
+ new Object[] {algorithmURI});
}
final InboundSecurityToken wrappingSecurityToken = getWrappingSecurityToken(wrappedSecurityToken);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEventReaderInputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEventReaderInputProcessor.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEventReaderInputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEventReaderInputProcessor.java Thu Apr 30 14:10:20 2015
@@ -72,7 +72,7 @@ public class XMLEventReaderInputProcesso
if (currentXMLStructureDepth > maximumAllowedXMLStructureDepth) {
XMLSecurityException xmlSecurityException = new XMLSecurityException(
"secureProcessing.MaximumAllowedXMLStructureDepth",
- maximumAllowedXMLStructureDepth
+ new Object[] {maximumAllowedXMLStructureDepth}
);
throw new XMLStreamException(xmlSecurityException);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java Thu Apr 30 14:10:20 2015
@@ -101,7 +101,8 @@ public abstract class AbstractEncryptOut
continue loop;
}
}
- throw new XMLSecurityException("stax.encryption.securePartNotFound", securePart.getName());
+ throw new XMLSecurityException("stax.encryption.securePartNotFound",
+ new Object[] {securePart.getName()});
}
}
}
@@ -150,7 +151,8 @@ public abstract class AbstractEncryptOut
//initialize the cipher
String jceAlgorithm = JCEAlgorithmMapper.translateURItoJCEID(encryptionSymAlgorithm);
if (jceAlgorithm == null) {
- throw new XMLSecurityException("algorithms.NoSuchMap", encryptionSymAlgorithm);
+ throw new XMLSecurityException("algorithms.NoSuchMap",
+ new Object[] {encryptionSymAlgorithm});
}
Cipher symmetricCipher = Cipher.getInstance(jceAlgorithm);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java Thu Apr 30 14:10:20 2015
@@ -155,7 +155,8 @@ public abstract class AbstractSignatureO
continue loop;
}
}
- throw new XMLSecurityException("stax.signature.securePartNotFound", securePart.getName());
+ throw new XMLSecurityException("stax.signature.securePartNotFound",
+ new Object[] {securePart.getName()});
}
}
}
@@ -176,7 +177,8 @@ public abstract class AbstractSignatureO
String jceName = JCEAlgorithmMapper.translateURItoJCEID(digestAlgorithm);
String jceProvider = JCEAlgorithmMapper.getJCEProviderFromURI(digestAlgorithm);
if (jceName == null) {
- throw new XMLSecurityException("algorithms.NoSuchMap", digestAlgorithm);
+ throw new XMLSecurityException("algorithms.NoSuchMap",
+ new Object[] {digestAlgorithm});
}
MessageDigest messageDigest;
try {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java Thu Apr 30 14:10:20 2015
@@ -186,7 +186,8 @@ public class XMLEncryptOutputProcessor e
//encrypt the symmetric session key with the public key from the receiver:
String jceid = JCEAlgorithmMapper.translateURItoJCEID(encryptionKeyTransportAlgorithm);
if (jceid == null) {
- throw new XMLSecurityException("algorithms.NoSuchMap", encryptionKeyTransportAlgorithm);
+ throw new XMLSecurityException("algorithms.NoSuchMap",
+ new Object[] {encryptionKeyTransportAlgorithm});
}
try {
@@ -294,7 +295,8 @@ public class XMLEncryptOutputProcessor e
} else if (SecurityTokenConstants.KeyIdentifier_X509SubjectName.equals(keyIdentifier)) {
XMLSecurityUtils.createX509SubjectNameStructure(this, outputProcessorChain, x509Certificates);
} else {
- throw new XMLSecurityException("stax.unsupportedToken", keyIdentifier);
+ throw new XMLSecurityException("stax.unsupportedToken",
+ new Object[] {keyIdentifier});
}
createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_KeyInfo);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java Thu Apr 30 14:10:20 2015
@@ -143,7 +143,8 @@ public class XMLSignatureEndingOutputPro
} else if (SecurityTokenConstants.KeyIdentifier_X509SubjectName.equals(keyIdentifier)) {
XMLSecurityUtils.createX509SubjectNameStructure(this, outputProcessorChain, x509Certificates);
} else {
- throw new XMLSecurityException("stax.unsupportedToken", keyIdentifier);
+ throw new XMLSecurityException("stax.unsupportedToken",
+ new Object[] {keyIdentifier});
}
} else if (securityToken.getPublicKey() != null) {
XMLSecurityUtils.createKeyValueTokenStructure(this, outputProcessorChain, securityToken.getPublicKey());
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java Thu Apr 30 14:10:20 2015
@@ -141,7 +141,8 @@ public abstract class AbstractInboundSec
} else if (key instanceof SecretKey) {
algorithmSuiteSecurityEvent.setKeyLength(key.getEncoded().length * 8);
} else {
- throw new XMLSecurityException("java.security.UnknownKeyType", key.getClass().getName());
+ throw new XMLSecurityException("java.security.UnknownKeyType",
+ new Object[] {key.getClass().getName()});
}
this.inboundSecurityContext.registerSecurityEvent(algorithmSuiteSecurityEvent);
}
@@ -174,7 +175,8 @@ public abstract class AbstractInboundSec
} else if (publicKey instanceof ECKey) {
algorithmSuiteSecurityEvent.setKeyLength(((ECKey) publicKey).getParams().getOrder().bitLength());
} else {
- throw new XMLSecurityException("java.security.UnknownKeyType", publicKey.getClass().getName());
+ throw new XMLSecurityException("java.security.UnknownKeyType",
+ new Object[] {publicKey.getClass().getName()});
}
inboundSecurityContext.registerSecurityEvent(algorithmSuiteSecurityEvent);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java Thu Apr 30 14:10:20 2015
@@ -106,7 +106,7 @@ public class SecurityTokenFactoryImpl ex
return token;
}
- throw new XMLSecurityException("stax.noKey", keyUsage);
+ throw new XMLSecurityException("stax.noKey", new Object[] {keyUsage});
}
private static InboundSecurityToken getSecurityToken(KeyValueType keyValueType,
@@ -181,7 +181,7 @@ public class SecurityTokenFactoryImpl ex
&& securityProperties.getSignatureVerificationKey() == null
|| SecurityTokenConstants.KeyUsage_Decryption.equals(keyUsage)
&& securityProperties.getDecryptionKey() == null) {
- throw new XMLSecurityException("stax.noKey", keyUsage);
+ throw new XMLSecurityException("stax.noKey", new Object[] {keyUsage});
}
X509IssuerSerialSecurityToken token =
new X509IssuerSerialSecurityToken(
@@ -201,7 +201,7 @@ public class SecurityTokenFactoryImpl ex
);
if (skiBytes != null) {
if (securityProperties.getSignatureVerificationKey() == null) {
- throw new XMLSecurityException("stax.noKey", keyUsage);
+ throw new XMLSecurityException("stax.noKey", new Object[] {keyUsage});
}
X509SKISecurityToken token =
new X509SKISecurityToken(
@@ -220,7 +220,7 @@ public class SecurityTokenFactoryImpl ex
);
if (subjectName != null) {
if (securityProperties.getSignatureVerificationKey() == null) {
- throw new XMLSecurityException("stax.noKey", keyUsage);
+ throw new XMLSecurityException("stax.noKey", new Object[] {keyUsage});
}
String normalizedSubjectName =
RFC2253Parser.normalize(subjectName);
@@ -233,7 +233,7 @@ public class SecurityTokenFactoryImpl ex
return token;
}
- throw new XMLSecurityException("stax.noKey", keyUsage);
+ throw new XMLSecurityException("stax.noKey", new Object[] {keyUsage});
}
private static void setTokenKey(XMLSecurityProperties securityProperties, SecurityTokenConstants.KeyUsage keyUsage,
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenFactory.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenFactory.java Thu Apr 30 14:10:20 2015
@@ -39,7 +39,8 @@ public abstract class SecurityTokenFacto
if (securityTokenFactory == null) {
String stf = ConfigurationProperties.getProperty("securityTokenFactory");
if (stf == null) {
- throw new XMLSecurityException("algorithm.ClassDoesNotExist", "null");
+ throw new XMLSecurityException("algorithm.ClassDoesNotExist",
+ new Object[] {"null"});
}
Class<?> callingClass = ConfigurationProperties.getCallingClass();
if (callingClass == null) {
@@ -52,11 +53,11 @@ public abstract class SecurityTokenFacto
(Class<SecurityTokenFactory>) ClassLoaderUtils.loadClass(stf, callingClass);
securityTokenFactory = securityTokenFactoryClass.newInstance();
} catch (ClassNotFoundException e) {
- throw new XMLSecurityException("algorithm.ClassDoesNotExist", new Object[]{stf}, e);
+ throw new XMLSecurityException(e, "algorithm.ClassDoesNotExist", new Object[]{stf});
} catch (InstantiationException e) {
- throw new XMLSecurityException("algorithm.ClassDoesNotExist", new Object[]{stf}, e);
+ throw new XMLSecurityException(e, "algorithm.ClassDoesNotExist", new Object[]{stf});
} catch (IllegalAccessException e) {
- throw new XMLSecurityException("algorithm.ClassDoesNotExist", new Object[]{stf}, e);
+ throw new XMLSecurityException(e, "algorithm.ClassDoesNotExist", new Object[]{stf});
}
}
return securityTokenFactory;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/InvalidTransformException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/InvalidTransformException.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/InvalidTransformException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/InvalidTransformException.java Thu Apr 30 14:10:20 2015
@@ -64,8 +64,8 @@ public class InvalidTransformException e
* @param msgId
* @param originalException
*/
- public InvalidTransformException(String msgId, Exception originalException) {
- super(msgId, originalException);
+ public InvalidTransformException(Exception originalException, String msgId) {
+ super(originalException, msgId);
}
/**
@@ -75,7 +75,7 @@ public class InvalidTransformException e
* @param exArgs
* @param originalException
*/
- public InvalidTransformException(String msgId, Object exArgs[], Exception originalException) {
- super(msgId, exArgs, originalException);
+ public InvalidTransformException(Exception originalException, String msgId, Object exArgs[]) {
+ super(originalException, msgId, exArgs);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java Thu Apr 30 14:10:20 2015
@@ -161,12 +161,12 @@ public final class Transform extends Sig
} catch (InstantiationException ex) {
Object exArgs[] = { algorithmURI };
throw new InvalidTransformException(
- "signature.Transform.UnknownTransform", exArgs, ex
+ ex, "signature.Transform.UnknownTransform", exArgs
);
} catch (IllegalAccessException ex) {
Object exArgs[] = { algorithmURI };
throw new InvalidTransformException(
- "signature.Transform.UnknownTransform", exArgs, ex
+ ex, "signature.Transform.UnknownTransform", exArgs
);
}
}
@@ -313,11 +313,11 @@ public final class Transform extends Sig
} catch (ParserConfigurationException ex) {
Object exArgs[] = { this.getURI(), "ParserConfigurationException" };
throw new CanonicalizationException(
- "signature.Transform.ErrorDuringTransform", exArgs, ex);
+ ex, "signature.Transform.ErrorDuringTransform", exArgs);
} catch (SAXException ex) {
Object exArgs[] = { this.getURI(), "SAXException" };
throw new CanonicalizationException(
- "signature.Transform.ErrorDuringTransform", exArgs, ex);
+ ex, "signature.Transform.ErrorDuringTransform", exArgs);
}
return result;
@@ -347,12 +347,12 @@ public final class Transform extends Sig
} catch (InstantiationException ex) {
Object exArgs[] = { algorithmURI };
throw new InvalidTransformException(
- "signature.Transform.UnknownTransform", exArgs, ex
+ ex, "signature.Transform.UnknownTransform", exArgs
);
} catch (IllegalAccessException ex) {
Object exArgs[] = { algorithmURI };
throw new InvalidTransformException(
- "signature.Transform.UnknownTransform", exArgs, ex
+ ex, "signature.Transform.UnknownTransform", exArgs
);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/TransformationException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/TransformationException.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/TransformationException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/TransformationException.java Thu Apr 30 14:10:20 2015
@@ -60,21 +60,21 @@ public class TransformationException ext
/**
* Constructor TransformationException
*
- * @param msgID
* @param originalException
+ * @param msgID
*/
- public TransformationException(String msgID, Exception originalException) {
- super(msgID, originalException);
+ public TransformationException(Exception originalException, String msgID) {
+ super(originalException, msgID);
}
/**
* Constructor TransformationException
*
+ * @param originalException
* @param msgID
* @param exArgs
- * @param originalException
*/
- public TransformationException(String msgID, Object exArgs[], Exception originalException) {
- super(msgID, exArgs, originalException);
+ public TransformationException(Exception originalException, String msgID, Object exArgs[]) {
+ super(originalException, msgID, exArgs);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.java Thu Apr 30 14:10:20 2015
@@ -169,7 +169,7 @@ public class Transforms extends Signatur
this.addTransform(transform);
} catch (InvalidTransformException ex) {
- throw new TransformationException("empty", ex);
+ throw new TransformationException(ex, "empty");
}
}
@@ -193,7 +193,7 @@ public class Transforms extends Signatur
this.addTransform(transform);
} catch (InvalidTransformException ex) {
- throw new TransformationException("empty", ex);
+ throw new TransformationException(ex, "empty");
}
}
@@ -213,7 +213,7 @@ public class Transforms extends Signatur
Transform transform = new Transform(getDocument(), transformURI, contextNodes);
this.addTransform(transform);
} catch (InvalidTransformException ex) {
- throw new TransformationException("empty", ex);
+ throw new TransformationException(ex, "empty");
}
}
@@ -282,11 +282,11 @@ public class Transforms extends Signatur
return xmlSignatureInput;
} catch (IOException ex) {
- throw new TransformationException("empty", ex);
+ throw new TransformationException(ex, "empty");
} catch (CanonicalizationException ex) {
- throw new TransformationException("empty", ex);
+ throw new TransformationException(ex, "empty");
} catch (InvalidCanonicalizerException ex) {
- throw new TransformationException("empty", ex);
+ throw new TransformationException(ex, "empty");
}
}
@@ -325,7 +325,7 @@ public class Transforms extends Signatur
initTransforms();
return new Transform(transforms[i], this.baseURI);
} catch (XMLSecurityException ex) {
- throw new TransformationException("empty", ex);
+ throw new TransformationException(ex, "empty");
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java Thu Apr 30 14:10:20 2015
@@ -153,12 +153,12 @@ public class TransformBase64Decode exten
output.setSecureValidation(secureValidation);
return output;
} catch (ParserConfigurationException e) {
- throw new TransformationException("c14n.Canonicalizer.Exception",e);
+ throw new TransformationException(e, "c14n.Canonicalizer.Exception");
} catch (SAXException e) {
- throw new TransformationException("SAX exception", e);
+ throw new TransformationException(e, "SAX exception");
}
} catch (Base64DecodingException e) {
- throw new TransformationException("Base64Decoding", e);
+ throw new TransformationException(e, "Base64Decoding");
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java Thu Apr 30 14:10:20 2015
@@ -88,7 +88,7 @@ public class TransformC14NExclusive exte
}
return output;
} catch (XMLSecurityException ex) {
- throw new CanonicalizationException("empty", ex);
+ throw new CanonicalizationException(ex, "empty");
}
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NExclusiveWithComments.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NExclusiveWithComments.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NExclusiveWithComments.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NExclusiveWithComments.java Thu Apr 30 14:10:20 2015
@@ -88,7 +88,7 @@ public class TransformC14NExclusiveWithC
return output;
} catch (XMLSecurityException ex) {
- throw new CanonicalizationException("empty", ex);
+ throw new CanonicalizationException(ex, "empty");
}
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java Thu Apr 30 14:10:20 2015
@@ -107,7 +107,7 @@ public class TransformXPath extends Tran
input.setNodeSet(true);
return input;
} catch (DOMException ex) {
- throw new TransformationException("empty", ex);
+ throw new TransformationException(ex, "empty");
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java Thu Apr 30 14:10:20 2015
@@ -135,21 +135,21 @@ public class TransformXPath2Filter exten
input.setNodeSet(true);
return input;
} catch (TransformerException ex) {
- throw new TransformationException("empty", ex);
+ throw new TransformationException(ex, "empty");
} catch (DOMException ex) {
- throw new TransformationException("empty", ex);
+ throw new TransformationException(ex, "empty");
} catch (CanonicalizationException ex) {
- throw new TransformationException("empty", ex);
+ throw new TransformationException(ex, "empty");
} catch (InvalidCanonicalizerException ex) {
- throw new TransformationException("empty", ex);
+ throw new TransformationException(ex, "empty");
} catch (XMLSecurityException ex) {
- throw new TransformationException("empty", ex);
+ throw new TransformationException(ex, "empty");
} catch (SAXException ex) {
- throw new TransformationException("empty", ex);
+ throw new TransformationException(ex, "empty");
} catch (IOException ex) {
- throw new TransformationException("empty", ex);
+ throw new TransformationException(ex, "empty");
} catch (ParserConfigurationException ex) {
- throw new TransformationException("empty", ex);
+ throw new TransformationException(ex, "empty");
}
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXSLT.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXSLT.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXSLT.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXSLT.java Thu Apr 30 14:10:20 2015
@@ -152,15 +152,15 @@ public class TransformXSLT extends Trans
} catch (XMLSecurityException ex) {
Object exArgs[] = { ex.getMessage() };
- throw new TransformationException("generic.EmptyMessage", exArgs, ex);
+ throw new TransformationException(ex, "generic.EmptyMessage", exArgs);
} catch (TransformerConfigurationException ex) {
Object exArgs[] = { ex.getMessage() };
- throw new TransformationException("generic.EmptyMessage", exArgs, ex);
+ throw new TransformationException(ex, "generic.EmptyMessage", exArgs);
} catch (TransformerException ex) {
Object exArgs[] = { ex.getMessage() };
- throw new TransformationException("generic.EmptyMessage", exArgs, ex);
+ throw new TransformationException(ex, "generic.EmptyMessage", exArgs);
}
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java Thu Apr 30 14:10:20 2015
@@ -84,9 +84,9 @@ public class ResourceResolver {
resolverTmp =
new ResourceResolver(resolver.resolverSpi.getClass().newInstance());
} catch (InstantiationException e) {
- throw new ResourceResolverException("", e, context.uriToResolve, context.baseUri);
+ throw new ResourceResolverException(e, context.uriToResolve, context.baseUri, "");
} catch (IllegalAccessException e) {
- throw new ResourceResolverException("", e, context.uriToResolve, context.baseUri);
+ throw new ResourceResolverException(e, context.uriToResolve, context.baseUri, "");
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverException.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverException.java Thu Apr 30 14:10:20 2015
@@ -67,14 +67,14 @@ public class ResourceResolverException e
/**
* Constructor ResourceResolverException
*
- * @param msgID
* @param originalException
* @param uri
* @param baseURI
+ * @param msgID
*/
- public ResourceResolverException(String msgID, Exception originalException,
- String uri, String baseURI) {
- super(msgID, originalException);
+ public ResourceResolverException(Exception originalException,
+ String uri, String baseURI, String msgID) {
+ super(originalException, msgID);
this.uri = uri;
this.baseURI = baseURI;
@@ -83,16 +83,15 @@ public class ResourceResolverException e
/**
* Constructor ResourceResolverException
*
- * @param msgID
- * @param exArgs
* @param originalException
* @param uri
* @param baseURI
+ * @param msgID
+ * @param exArgs
*/
- public ResourceResolverException(String msgID, Object exArgs[],
- Exception originalException, String uri,
- String baseURI) {
- super(msgID, exArgs, originalException);
+ public ResourceResolverException(Exception originalException, String uri,
+ String baseURI, String msgID, Object exArgs[]) {
+ super(originalException, msgID, exArgs);
this.uri = uri;
this.baseURI = baseURI;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java Thu Apr 30 14:10:20 2015
@@ -151,13 +151,13 @@ public class ResolverDirectHTTP extends
return result;
} catch (URISyntaxException ex) {
- throw new ResourceResolverException("generic.EmptyMessage", ex, context.uriToResolve, context.baseUri);
+ throw new ResourceResolverException(ex, context.uriToResolve, context.baseUri, "generic.EmptyMessage");
} catch (MalformedURLException ex) {
- throw new ResourceResolverException("generic.EmptyMessage", ex, context.uriToResolve, context.baseUri);
+ throw new ResourceResolverException(ex, context.uriToResolve, context.baseUri, "generic.EmptyMessage");
} catch (IOException ex) {
- throw new ResourceResolverException("generic.EmptyMessage", ex, context.uriToResolve, context.baseUri);
+ throw new ResourceResolverException(ex, context.uriToResolve, context.baseUri, "generic.EmptyMessage");
} catch (IllegalArgumentException e) {
- throw new ResourceResolverException("generic.EmptyMessage", e, context.uriToResolve, context.baseUri);
+ throw new ResourceResolverException(e, context.uriToResolve, context.baseUri, "generic.EmptyMessage");
} finally {
if (inputStream != null) {
try {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java Thu Apr 30 14:10:20 2015
@@ -62,7 +62,7 @@ public class ResolverLocalFilesystem ext
return result;
} catch (Exception e) {
- throw new ResourceResolverException("generic.EmptyMessage", e, context.uriToResolve, context.baseUri);
+ throw new ResourceResolverException(e, context.uriToResolve, context.baseUri, "generic.EmptyMessage");
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java Thu Apr 30 14:10:20 2015
@@ -128,7 +128,7 @@ public class ProcessingInstructionTest e
return result;
} catch (Exception ex) {
throw new ResourceResolverException(
- "generic.EmptyMessage", ex, context.uriToResolve, context.baseUri
+ ex, context.uriToResolve, context.baseUri, "generic.EmptyMessage"
);
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java Thu Apr 30 14:10:20 2015
@@ -202,7 +202,7 @@ public class XPointerResourceResolver ex
return result;
} catch (XPathExpressionException e) {
throw new ResourceResolverException(
- "Problem evaluating XPath expression", e, context.uriToResolve, context.baseUri
+ e, context.uriToResolve, context.baseUri, "Problem evaluating XPath expression"
);
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java?rev=1676996&r1=1676995&r2=1676996&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java Thu Apr 30 14:10:20 2015
@@ -126,7 +126,7 @@ public class OfflineResolver extends Res
}
} catch (IOException ex) {
throw new ResourceResolverException(
- "generic.EmptyMessage", ex, context.uriToResolve, context.baseUri
+ ex, context.uriToResolve, context.baseUri, "generic.EmptyMessage"
);
}
}