svn commit: r291014 - in /webservices/wss4j/trunk/src/org/apache/ws/security: message/EnvelopeIdResolver.java transform/STRTransform.java

Author: werner
Date: Thu Sep 22 13:23:35 2005
New Revision: 291014

URL: http://svn.apache.org/viewcvs?rev=291014&view=rev
Log:
Prepare some code for new xml-sec optimized feature. This
code is not enabled - don't use this features now because
they break STRTransform.

Modified:
    
webservices/wss4j/trunk/src/org/apache/ws/security/message/EnvelopeIdResolver.java
    
webservices/wss4j/trunk/src/org/apache/ws/security/transform/STRTransform.java

Modified: 
webservices/wss4j/trunk/src/org/apache/ws/security/message/EnvelopeIdResolver.java
URL: 
http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/message/EnvelopeIdResolver.java?rev=291014&r1=291013&r2=291014&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/org/apache/ws/security/message/EnvelopeIdResolver.java
 (original)
+++ 
webservices/wss4j/trunk/src/org/apache/ws/security/message/EnvelopeIdResolver.java
 Thu Sep 22 13:23:35 2005
@@ -138,6 +138,7 @@
 
         Set resultSet = dereferenceSameDocumentURI(selectedElem);
         XMLSignatureInput result = new XMLSignatureInput(resultSet);
+//        XMLSignatureInput result = new XMLSignatureInput(selectedElem);
         result.setMIMEType("text/xml");
         try {
             URI uriNew = new URI(new URI(BaseURI), uri.getNodeValue());

Modified: 
webservices/wss4j/trunk/src/org/apache/ws/security/transform/STRTransform.java
URL: 
http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/transform/STRTransform.java?rev=291014&r1=291013&r2=291014&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/org/apache/ws/security/transform/STRTransform.java 
(original)
+++ 
webservices/wss4j/trunk/src/org/apache/ws/security/transform/STRTransform.java 
Thu Sep 22 13:23:35 2005
@@ -160,7 +160,8 @@
                 }
             }
             Canonicalizer canon = Canonicalizer.getInstance(canonAlgo);
-            byte buf[] = canon.canonicalizeXPathNodeSet(input.getNodeSet());
+//            byte buf[] = canon.canonicalizeXPathNodeSet(input.getNodeSet());
+            byte buf[] = input.getBytes();
 
             ByteArrayOutputStream bos = new ByteArrayOutputStream(buf.length);
             bos.write(buf, 0, buf.length);