svn commit: r476727 - in /webservices/wss4j/trunk: lib/xmlsec-1.3.0.jar lib/xmlsec-1.4.SNAPSHOT.jar src/org/apache/ws/security/transform/STRTransform.java

[ruchithf]

Author: ruchithf
Date: Sat Nov 18 22:21:08 2006
New Revision: 476727

URL: http://svn.apache.org/viewvc?view=rev&rev=476727
Log:
updated for xml-sec-1.4 and added the xml-sec-1.4-SNAPSHOT.jar

Added:
    webservices/wss4j/trunk/lib/xmlsec-1.4.SNAPSHOT.jar   (with props)
Removed:
    webservices/wss4j/trunk/lib/xmlsec-1.3.0.jar
Modified:
    
webservices/wss4j/trunk/src/org/apache/ws/security/transform/STRTransform.java

Added: webservices/wss4j/trunk/lib/xmlsec-1.4.SNAPSHOT.jar
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/lib/xmlsec-1.4.SNAPSHOT.jar?view=auto&rev=476727
==============================================================================
Binary file - no diff available.

Propchange: webservices/wss4j/trunk/lib/xmlsec-1.4.SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: 
webservices/wss4j/trunk/src/org/apache/ws/security/transform/STRTransform.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/transform/STRTransform.java?view=diff&rev=476727&r1=476726&r2=476727
==============================================================================
--- 
webservices/wss4j/trunk/src/org/apache/ws/security/transform/STRTransform.java 
(original)
+++ 
webservices/wss4j/trunk/src/org/apache/ws/security/transform/STRTransform.java 
Sat Nov 18 22:21:08 2006
@@ -30,16 +30,22 @@
 import org.apache.xml.security.c14n.Canonicalizer;
 import org.apache.xml.security.c14n.InvalidCanonicalizerException;
 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.ws.security.util.Base64;
 import org.apache.xml.security.utils.XMLUtils;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.ParserConfigurationException;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
 
@@ -88,17 +94,10 @@
     protected String engineGetURI() {
         return STRTransform.implementedTransformURI;
     }
+    
+    
 
-    /**
-     * Method enginePerformTransform
-     * 
-     * @param input
-     * @throws CanonicalizationException
-     * @throws InvalidCanonicalizerException
-     */
-    protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
-            throws IOException, CanonicalizationException,
-            InvalidCanonicalizerException {
+    protected XMLSignatureInput enginePerformTransform(XMLSignatureInput 
input, OutputStream os, Transform _transformObject) throws IOException, 
CanonicalizationException, InvalidCanonicalizerException, 
TransformationException, ParserConfigurationException, SAXException {
 
         doDebug = log.isDebugEnabled();
 
@@ -111,7 +110,7 @@
             /*
              * Get the main document, that is the complete SOAP request 
document
              */
-            Document thisDoc = this._transformObject.getDocument();
+            Document thisDoc = _transformObject.getDocument();
             int docHash = thisDoc.hashCode();
             if (doDebug) {
                 log.debug("doc: " + thisDoc.toString() + ", " + docHash);
@@ -139,9 +138,9 @@
              */
 
             String canonAlgo = null;
-            if (this._transformObject.length(WSConstants.WSSE_NS,
+            if (_transformObject.length(WSConstants.WSSE_NS,
                     "TransformationParameters") == 1) {
-                Element tmpE = XMLUtils.selectNode(this._transformObject
+                Element tmpE = XMLUtils.selectNode(_transformObject
                         .getElement().getFirstChild(), WSConstants.WSSE_NS,
                         "TransformationParameters", 0);
                 Element canonElem = (Element) WSSecurityUtil.getDirectChild(



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]