[jbossws-commits] JBossWS SVN: r15829 - in stack/native/trunk: modules/core/src/main/java/org/jboss/ws/extensions/security and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2012-03-02 11:29:42 -0500 (Fri, 02 Mar 2012)
New Revision: 15829

Modified:
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/STRTransform.java
   stack/native/trunk/pom.xml
Log:
[JBWS-3439] Move JBossWS-Native stack too to Santuario 1.5.1


Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/STRTransform.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/STRTransform.java	2012-03-02 10:54:49 UTC (rev 15828)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/STRTransform.java	2012-03-02 16:29:42 UTC (rev 15829)
@@ -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/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml	2012-03-02 10:54:49 UTC (rev 15828)
+++ stack/native/trunk/pom.xml	2012-03-02 16:29:42 UTC (rev 15829)
@@ -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>