svn commit: r1231031 - in /webservices/wss4j/trunk/src: main/java/org/apache/ws/security/WSSecurityEngine.java test/java/org/apache/ws/security/message/ModifiedRequestTest.java

[coheigea]

Author: coheigea
Date: Fri Jan 13 12:06:46 2012
New Revision: 1231031

URL: http://svn.apache.org/viewvc?rev=1231031&view=rev
Log:
Some changes for xmlsec 1.5.0-SNAPSHOT

Modified:
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSecurityEngine.java
    
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/ModifiedRequestTest.java

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSecurityEngine.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSecurityEngine.java?rev=1231031&r1=1231030&r2=1231031&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSecurityEngine.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSecurityEngine.java
 Fri Jan 13 12:06:46 2012
@@ -26,7 +26,6 @@ import org.apache.ws.security.message.Ca
 import org.apache.ws.security.message.token.UsernameToken;
 import org.apache.ws.security.processor.Processor;
 import org.apache.ws.security.util.WSSecurityUtil;
-import org.apache.xml.security.utils.IdResolver;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -418,9 +417,6 @@ public class WSSecurityEngine {
             }
         }
         
-        // Remove stored signature elements from the Santuario IdResolver cache
-        IdResolver.unregisterDocument(securityHeader.getOwnerDocument());
-        
         return returnResults;
     }
 }

Modified: 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/ModifiedRequestTest.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/ModifiedRequestTest.java?rev=1231031&r1=1231030&r2=1231031&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/ModifiedRequestTest.java
 (original)
+++ 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/ModifiedRequestTest.java
 Fri Jan 13 12:06:46 2012
@@ -36,7 +36,6 @@ import org.apache.ws.security.saml.ext.S
 import org.apache.ws.security.saml.ext.builder.SAML1Constants;
 import org.apache.ws.security.util.WSSecurityUtil;
 import org.apache.ws.security.util.XmlSchemaDateFormat;
-import org.apache.xml.security.utils.IdResolver;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -174,9 +173,6 @@ public class ModifiedRequestTest extends
              WSConstants.WSU_NS, "wsu:Id", "id-250"
         );
         
-        // Clear the Santuario IdResolver cache
-        IdResolver.unregisterDocument(signedDoc);
-            
         if (LOG.isDebugEnabled()) {
             LOG.debug("After Signing....");
             String outputString =