You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by ra...@apache.org on 2006/06/08 20:29:14 UTC
svn commit: r412829 - in /xml/security/trunk:
src/org/apache/xml/security/transforms/
src/org/apache/xml/security/transforms/implementations/
src_samples/org/apache/xml/security/samples/transforms/
src_unitTests/org/apache/xml/security/test/encryption/
Author: raul
Date: Thu Jun 8 11:29:13 2006
New Revision: 412829
URL: http://svn.apache.org/viewvc?rev=412829&view=rev
Log:
API Change: Make Transform & TransformSpi reusable
between threads.
Removed setTransform(Transform t) method in TransformSpi and pass
the Transform object in enginePerformTransfor methods.
Modified:
xml/security/trunk/src/org/apache/xml/security/transforms/Transform.java
xml/security/trunk/src/org/apache/xml/security/transforms/TransformSpi.java
xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java
xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14N.java
xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java
xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusiveWithComments.java
xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NWithComments.java
xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformEnvelopedSignature.java
xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPath.java
xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java
xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPointer.java
xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXSLT.java
xml/security/trunk/src_samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/encryption/XMLCipherTester.java
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/Transform.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/Transform.java?rev=412829&r1=412828&r2=412829&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/Transform.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/Transform.java Thu Jun 8 11:29:13 2006
@@ -65,7 +65,7 @@
/** All available Transform classes are registered here */
static Map _transformHash = null;
- static Map classesHash = new HashMap();
+ static HashMap classesHash = new HashMap();
/** Field transformSpi */
protected TransformSpi transformSpi = null;
@@ -104,7 +104,7 @@
}
// create the custom Transform object
- this.transformSpi.setTransform(this);
+ //this.transformSpi.setTransform(this);
// give it to the current document
if (contextNodes != null) {
@@ -148,19 +148,17 @@
throw new TransformationException("xml.WrongContent", exArgs);
}
- try {
- // Class implementingClass = (Class) _transformHash.get(AlgorithmURI);
- this.transformSpi = Transform.getImplementingClass(AlgorithmURI);
- // (TransformSpi) implementingClass.newInstance();
-
- this.transformSpi.setTransform(this);
- } catch (NullPointerException e) {
+ // Class implementingClass = (Class) _transformHash.get(AlgorithmURI);
+ this.transformSpi = Transform.getImplementingClass(AlgorithmURI);
+ //this.transformSpi.setTransform(this);
+
+ if (this.transformSpi==null) {
Object exArgs[] = { AlgorithmURI };
throw new InvalidTransformException(
"signature.Transform.UnknownTransform", exArgs);
- }
+ }
}
/**
@@ -289,7 +287,7 @@
XMLSignatureInput result = null;
try {
- result = transformSpi.enginePerformTransform(input);
+ result = transformSpi.enginePerformTransform(input, this);
} catch (ParserConfigurationException ex) {
Object exArgs[] = { this.getURI(), "ParserConfigurationException" };
@@ -323,7 +321,7 @@
XMLSignatureInput result = null;
try {
- result = transformSpi.enginePerformTransform(input,os);
+ result = transformSpi.enginePerformTransform(input,os, this);
} catch (ParserConfigurationException ex) {
Object exArgs[] = { this.getURI(), "ParserConfigurationException" };
@@ -357,7 +355,7 @@
TransformSpi tr= (TransformSpi)cl.newInstance();
classesHash.put(URI,tr);
return tr;
- }
+ }
} catch (InstantiationException ex) {
Object exArgs[] = { URI };
throw new InvalidTransformException(
@@ -367,7 +365,7 @@
throw new InvalidTransformException(
"signature.Transform.UnknownTransform", exArgs, ex);
}
- return null;
+ return null;
}
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/TransformSpi.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/TransformSpi.java?rev=412829&r1=412828&r2=412829&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/TransformSpi.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/TransformSpi.java Thu Jun 8 11:29:13 2006
@@ -28,22 +28,17 @@
/**
* Base class which all Transform algorithms extend. The common methods that
- * have to be overridden are the {@link #enginePerformTransform(XMLSignatureInput)} method.
+ * have to be overridden are the {@link #enginePerformTransform(XMLSignatureInput, Transform)} method.
*
* @author Christian Geuer-Pollmann
*/
-public abstract class TransformSpi {
-
- protected Transform _transformObject = null;
- protected void setTransform(Transform transform) {
- this._transformObject = transform;
- }
-
+public abstract class TransformSpi {
/**
* The mega method which MUST be implemented by the Transformation Algorithm.
*
* @param input {@link XMLSignatureInput} as the input of transformation
- * @param os where to output this transformation.
+ * @param os where to output this transformation.
+ * @param _transformObject TODO
* @return {@link XMLSignatureInput} as the result of transformation
* @throws CanonicalizationException
* @throws IOException
@@ -53,17 +48,18 @@
* @throws TransformationException
*/
protected XMLSignatureInput enginePerformTransform(
- XMLSignatureInput input, OutputStream os)
+ XMLSignatureInput input, OutputStream os, Transform _transformObject)
throws IOException,
CanonicalizationException, InvalidCanonicalizerException,
TransformationException, ParserConfigurationException,
SAXException {
- return enginePerformTransform(input);
+ return enginePerformTransform(input, _transformObject);
}
/**
* The mega method which MUST be implemented by the Transformation Algorithm.
*
* @param input {@link XMLSignatureInput} as the input of transformation
+ * @param _transformObject TODO
* @return {@link XMLSignatureInput} as the result of transformation
* @throws CanonicalizationException
* @throws IOException
@@ -73,7 +69,7 @@
* @throws TransformationException
*/
protected abstract XMLSignatureInput enginePerformTransform(
- XMLSignatureInput input)
+ XMLSignatureInput input, Transform _transformObject)
throws IOException,
CanonicalizationException, InvalidCanonicalizerException,
TransformationException, ParserConfigurationException,
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java?rev=412829&r1=412828&r2=412829&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java Thu Jun 8 11:29:13 2006
@@ -29,6 +29,7 @@
import org.apache.xml.security.c14n.CanonicalizationException;
import org.apache.xml.security.exceptions.Base64DecodingException;
import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.transforms.Transform;
import org.apache.xml.security.transforms.TransformSpi;
import org.apache.xml.security.transforms.TransformationException;
import org.apache.xml.security.transforms.Transforms;
@@ -91,13 +92,13 @@
* @throws IOException
* @throws TransformationException
*/
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform _transformObject)
throws IOException, CanonicalizationException,
TransformationException {
- return enginePerformTransform(input,null);
+ return enginePerformTransform(input,null, null);
}
protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,
- OutputStream os)
+ OutputStream os, Transform _transformObject)
throws IOException, CanonicalizationException,
TransformationException {
try {
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14N.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14N.java?rev=412829&r1=412828&r2=412829&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14N.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14N.java Thu Jun 8 11:29:13 2006
@@ -23,6 +23,7 @@
import org.apache.xml.security.c14n.CanonicalizationException;
import org.apache.xml.security.c14n.implementations.Canonicalizer20010315OmitComments;
import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.transforms.Transform;
import org.apache.xml.security.transforms.TransformSpi;
import org.apache.xml.security.transforms.Transforms;
@@ -50,11 +51,11 @@
/**
* @inheritDoc
*/
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform _transformObject)
throws CanonicalizationException {
- return enginePerformTransform(input,null);
+ return enginePerformTransform(input,null, null);
}
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream os)
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream os, Transform _transformObject)
throws CanonicalizationException {
Canonicalizer20010315OmitComments c14n = new Canonicalizer20010315OmitComments();
if (os!=null) {
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java?rev=412829&r1=412828&r2=412829&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusive.java Thu Jun 8 11:29:13 2006
@@ -24,6 +24,7 @@
import org.apache.xml.security.c14n.implementations.Canonicalizer20010315ExclOmitComments;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.transforms.Transform;
import org.apache.xml.security.transforms.TransformSpi;
import org.apache.xml.security.transforms.Transforms;
import org.apache.xml.security.transforms.params.InclusiveNamespaces;
@@ -60,27 +61,27 @@
* @return the transformed of the input
* @throws CanonicalizationException
*/
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform _transformObject)
throws CanonicalizationException {
- return enginePerformTransform(input,null);
+ return enginePerformTransform(input,null, null);
}
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream os)
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream os, Transform _transformObject)
throws CanonicalizationException {
try {
String inclusiveNamespaces = null;
- if (this._transformObject
+ if (_transformObject
.length(InclusiveNamespaces
.ExclusiveCanonicalizationNamespace, InclusiveNamespaces
._TAG_EC_INCLUSIVENAMESPACES) == 1) {
Element inclusiveElement =
XMLUtils.selectNode(
- this._transformObject.getElement().getFirstChild(),
+ _transformObject.getElement().getFirstChild(),
InclusiveNamespaces.ExclusiveCanonicalizationNamespace,
InclusiveNamespaces._TAG_EC_INCLUSIVENAMESPACES,0);
inclusiveNamespaces = new InclusiveNamespaces(inclusiveElement,
- this._transformObject.getBaseURI()).getInclusiveNamespaces();
+ _transformObject.getBaseURI()).getInclusiveNamespaces();
}
Canonicalizer20010315ExclOmitComments c14n =
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusiveWithComments.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusiveWithComments.java?rev=412829&r1=412828&r2=412829&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusiveWithComments.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NExclusiveWithComments.java Thu Jun 8 11:29:13 2006
@@ -24,6 +24,7 @@
import org.apache.xml.security.c14n.implementations.Canonicalizer20010315ExclWithComments;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.transforms.Transform;
import org.apache.xml.security.transforms.TransformSpi;
import org.apache.xml.security.transforms.Transforms;
import org.apache.xml.security.transforms.params.InclusiveNamespaces;
@@ -56,27 +57,27 @@
/**
* @inheritDoc
*/
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform _transformObject)
throws CanonicalizationException {
- return enginePerformTransform(input,null);
+ return enginePerformTransform(input,null, null);
}
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream os)
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream os, Transform _transformObject)
throws CanonicalizationException {
try {
String inclusiveNamespaces = null;
- if (this._transformObject
+ if (_transformObject
.length(InclusiveNamespaces
.ExclusiveCanonicalizationNamespace, InclusiveNamespaces
._TAG_EC_INCLUSIVENAMESPACES) == 1) {
Element inclusiveElement =
XMLUtils.selectNode(
- this._transformObject.getElement().getFirstChild(),
+ _transformObject.getElement().getFirstChild(),
InclusiveNamespaces.ExclusiveCanonicalizationNamespace,
InclusiveNamespaces._TAG_EC_INCLUSIVENAMESPACES,0);
inclusiveNamespaces = new InclusiveNamespaces(inclusiveElement,
- this._transformObject.getBaseURI()).getInclusiveNamespaces();
+ _transformObject.getBaseURI()).getInclusiveNamespaces();
}
Canonicalizer20010315ExclWithComments c14n =
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NWithComments.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NWithComments.java?rev=412829&r1=412828&r2=412829&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NWithComments.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformC14NWithComments.java Thu Jun 8 11:29:13 2006
@@ -23,6 +23,7 @@
import org.apache.xml.security.c14n.CanonicalizationException;
import org.apache.xml.security.c14n.implementations.Canonicalizer20010315WithComments;
import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.transforms.Transform;
import org.apache.xml.security.transforms.TransformSpi;
import org.apache.xml.security.transforms.Transforms;
@@ -45,12 +46,12 @@
return implementedTransformURI;
}
/** @inheritDoc */
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform _transformObject)
throws CanonicalizationException {
- return enginePerformTransform(input,null);
+ return enginePerformTransform(input,null, null);
}
/** @inheritDoc */
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream os)
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream os, Transform _transformObject)
throws CanonicalizationException {
Canonicalizer20010315WithComments c14n = new Canonicalizer20010315WithComments();
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformEnvelopedSignature.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformEnvelopedSignature.java?rev=412829&r1=412828&r2=412829&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformEnvelopedSignature.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformEnvelopedSignature.java Thu Jun 8 11:29:13 2006
@@ -18,6 +18,7 @@
import org.apache.xml.security.signature.NodeFilter;
import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.transforms.Transform;
import org.apache.xml.security.transforms.TransformSpi;
import org.apache.xml.security.transforms.TransformationException;
import org.apache.xml.security.transforms.Transforms;
@@ -50,7 +51,7 @@
/**
* @inheritDoc
*/
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform _transformObject)
throws TransformationException {
@@ -66,15 +67,8 @@
* The evaluation of this expression includes all of the document's nodes
* (including comments) in the node-set representing the octet stream.
*/
-
- /*
- if (input.isOctetStream()) {
- input.setNodesetXPath(Canonicalizer.XPATH_C14N_WITH_COMMENTS);
- }
- */
-
- Element transformElement = this._transformObject.getElement();
- Node signatureElement = transformElement;
+
+ Node signatureElement = _transformObject.getElement();
signatureElement = searchSignatureElement(signatureElement);
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPath.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPath.java?rev=412829&r1=412828&r2=412829&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPath.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPath.java Thu Jun 8 11:29:13 2006
@@ -21,6 +21,7 @@
import org.apache.xml.security.exceptions.XMLSecurityRuntimeException;
import org.apache.xml.security.signature.NodeFilter;
import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.transforms.Transform;
import org.apache.xml.security.transforms.TransformSpi;
import org.apache.xml.security.transforms.TransformationException;
import org.apache.xml.security.transforms.Transforms;
@@ -66,7 +67,7 @@
*
* @throws TransformationException
*/
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform _transformObject)
throws TransformationException {
try {
@@ -82,12 +83,12 @@
* The evaluation of this expression includes all of the document's nodes
* (including comments) in the node-set representing the octet stream.
*/
- CachedXPathAPIHolder.setDoc(this._transformObject.getElement().getOwnerDocument());
+ CachedXPathAPIHolder.setDoc(_transformObject.getElement().getOwnerDocument());
Element xpathElement =XMLUtils.selectDsNode(
- this._transformObject.getElement().getFirstChild(),
+ _transformObject.getElement().getFirstChild(),
Constants._TAG_XPATH,0);
if (xpathElement == null) {
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java?rev=412829&r1=412828&r2=412829&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java Thu Jun 8 11:29:13 2006
@@ -30,6 +30,7 @@
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.signature.NodeFilter;
import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.transforms.Transform;
import org.apache.xml.security.transforms.TransformSpi;
import org.apache.xml.security.transforms.TransformationException;
import org.apache.xml.security.transforms.Transforms;
@@ -84,9 +85,9 @@
*
* @throws TransformationException
*/
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform _transformObject)
throws TransformationException {
- CachedXPathAPIHolder.setDoc(this._transformObject.getElement().getOwnerDocument());
+ CachedXPathAPIHolder.setDoc(_transformObject.getElement().getOwnerDocument());
try {
List unionNodes=new ArrayList();
List substractNodes=new ArrayList();
@@ -97,7 +98,7 @@
Element []xpathElements =XMLUtils.selectNodes(
- this._transformObject.getElement().getFirstChild(),
+ _transformObject.getElement().getFirstChild(),
XPath2FilterContainer.XPathFilter2NS,
XPath2FilterContainer._TAG_XPATH2);
int noOfSteps = xpathElements.length;
@@ -118,7 +119,7 @@
for (int i = 0; i < noOfSteps; i++) {
Element xpathElement =XMLUtils.selectNode(
- this._transformObject.getElement().getFirstChild(),
+ _transformObject.getElement().getFirstChild(),
XPath2FilterContainer.XPathFilter2NS,
XPath2FilterContainer._TAG_XPATH2,i);
XPath2FilterContainer xpathContainer =
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPointer.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPointer.java?rev=412829&r1=412828&r2=412829&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPointer.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXPointer.java Thu Jun 8 11:29:13 2006
@@ -21,6 +21,7 @@
import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.transforms.Transform;
import org.apache.xml.security.transforms.TransformSpi;
import org.apache.xml.security.transforms.TransformationException;
import org.apache.xml.security.transforms.Transforms;
@@ -52,7 +53,7 @@
* @throws TransformationException
*
*/
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform _transformObject)
throws TransformationException {
Object exArgs[] = { implementedTransformURI };
Modified: xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXSLT.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXSLT.java?rev=412829&r1=412828&r2=412829&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXSLT.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/transforms/implementations/TransformXSLT.java Thu Jun 8 11:29:13 2006
@@ -35,6 +35,7 @@
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.transforms.Transform;
import org.apache.xml.security.transforms.TransformSpi;
import org.apache.xml.security.transforms.TransformationException;
import org.apache.xml.security.transforms.Transforms;
@@ -78,16 +79,16 @@
* @throws IOException
* @throws TransformationException
*/
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform _transformObject)
throws IOException,
TransformationException {
- return enginePerformTransform(input,null);
+ return enginePerformTransform(input,null, null);
}
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream baos)
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream baos, Transform _transformObject)
throws IOException,
TransformationException {
try {
- Element transformElement = this._transformObject.getElement();
+ Element transformElement = _transformObject.getElement();
Element _xsltElement =
XMLUtils.selectNode(transformElement.getFirstChild(),
Modified: xml/security/trunk/src_samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java?rev=412829&r1=412828&r2=412829&view=diff
==============================================================================
--- xml/security/trunk/src_samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java (original)
+++ xml/security/trunk/src_samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java Thu Jun 8 11:29:13 2006
@@ -20,6 +20,7 @@
import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.transforms.Transform;
import org.apache.xml.security.transforms.TransformSpi;
@@ -61,7 +62,7 @@
* @param input
*
*/
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input) {
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform _transformObject) {
return input;
}
Modified: xml/security/trunk/src_unitTests/org/apache/xml/security/test/encryption/XMLCipherTester.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/org/apache/xml/security/test/encryption/XMLCipherTester.java?rev=412829&r1=412828&r2=412829&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/org/apache/xml/security/test/encryption/XMLCipherTester.java (original)
+++ xml/security/trunk/src_unitTests/org/apache/xml/security/test/encryption/XMLCipherTester.java Thu Jun 8 11:29:13 2006
@@ -81,7 +81,7 @@
}
protected void setUp() {
- String basedir = System.getProperty("basedir");
+ String basedir = System.getProperty("basedir",".");
documentName = System.getProperty("org.apache.xml.enc.test.doc",
basedir + "/build.xml");
elementName = System.getProperty("org.apache.xml.enc.test.elem",