Author: alessio.soldano(a)jboss.com Date: 2012-03-02 11:34:12 -0500 (Fri, 02 Mar 2012) New Revision: 15830 Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/extensions/security/STRTransform.java stack/native/branches/jbossws-native-4.0.x/pom.xml Log: Merged revisions 15829 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r15829 | alessio.soldano(a)jboss.com | 2012-03-02 17:29:42 +0100 (Fri, 02 Mar 2012) | 2 lines [JBWS-3439] Move JBossWS-Native stack too to Santuario 1.5.1 ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829 Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/extensions/security/STRTransform.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/extensions/security/STRTransform.java 2012-03-02 16:29:42 UTC (rev 15829) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/extensions/security/STRTransform.java 2012-03-02 16:34:12 UTC (rev 15830) @@ -22,6 +22,7 @@ package org.jboss.ws.extensions.security; import java.io.IOException; +import java.io.OutputStream; import java.util.ResourceBundle; import javax.xml.parsers.ParserConfigurationException; @@ -91,9 +92,15 @@ return STR_URI; } + @Override + protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform transformObject) throws IOException, CanonicalizationException, + InvalidCanonicalizerException, TransformationException, ParserConfigurationException, SAXException + { + return enginePerformTransform(input, null, transformObject); + } @Override - protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input) throws IOException, CanonicalizationException, + protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, OutputStream os, Transform transformObject) throws IOException, CanonicalizationException, InvalidCanonicalizerException, TransformationException, ParserConfigurationException, SAXException { @@ -117,7 +124,7 @@ element = token.getSTRTransformElement(); // Obtain the canonicalizer specified in the transformation parameters - Element parameters = XMLUtils.selectNode(this._transformObject.getElement().getFirstChild(), Constants.WSSE_NS, + Element parameters = XMLUtils.selectNode(transformObject.getElement().getFirstChild(), Constants.WSSE_NS, "TransformationParameters", 0); if (parameters == null) throw new TransformationException(BundleUtils.getMessage(bundle, "TRANSFORMATIONPARAMETERS_EXPECTED")); Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-02 16:29:42 UTC (rev 15829) +++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-02 16:34:12 UTC (rev 15830) @@ -94,7 +94,7 @@ <woodstox.version>3.2.6</woodstox.version> <wscommons.policy.version>1.0</wscommons.policy.version> <wsdl4j.version>1.6.2</wsdl4j.version> - <xmlsec.version>1.4.6</xmlsec.version> + <xmlsec.version>1.5.1</xmlsec.version> <xerces.version>2.9.1</xerces.version> <jbossxb.version>2.0.3.GA</jbossxb.version> <junit.version>3.8.1</junit.version>