[WSS4J] wss4j/src/org/apache/ws/security/message WSBaseMessage.java,1.9,1.10 WSEncryptBody.java,1.27,1.28 WSSignEnvelope.java,1.25,1.26

Update of /cvsroot/wss4j/wss4j/src/org/apache/ws/security/message
In directory sc8-pr-cvs1:/tmp/cvs-serv7558/src/org/apache/ws/security/message

Modified Files:
	WSBaseMessage.java WSEncryptBody.java WSSignEnvelope.java 
Log Message:
- Fix test failure
- Added diagnostics for gump 

Index: WSBaseMessage.java
===================================================================
RCS file: /cvsroot/wss4j/wss4j/src/org/apache/ws/security/message/WSBaseMessage.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** WSBaseMessage.java	21 Jan 2004 12:14:42 -0000	1.9
--- WSBaseMessage.java	21 Jan 2004 13:21:37 -0000	1.10
***************
*** 85,90 ****
  	protected Vector parts = null;
  	
- 	protected SOAPConstants soapConstants = null;
- 	
  	protected boolean doDebug = false;
  
--- 85,88 ----
***************
*** 191,194 ****
--- 189,193 ----
  	 */
  	protected String setBodyID(Document doc) throws Exception {
+ 		SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(doc.getDocumentElement());
  		Element bodyElement =
  			(Element) WSSecurityUtil.getDirectChild(
***************
*** 242,245 ****
--- 241,245 ----
  	 */
  	protected Element insertSecurityHeader(Document doc, boolean timestamp) {
+ 		SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(doc.getDocumentElement());
  		// lookup a security header block that matches actor
  		Element securityHeader =

Index: WSEncryptBody.java
===================================================================
RCS file: /cvsroot/wss4j/wss4j/src/org/apache/ws/security/message/WSEncryptBody.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** WSEncryptBody.java	21 Jan 2004 12:14:41 -0000	1.27
--- WSEncryptBody.java	21 Jan 2004 13:21:37 -0000	1.28
***************
*** 58,61 ****
--- 58,62 ----
  import org.apache.commons.logging.LogFactory;
  import org.apache.ws.security.WSConstants;
+ import org.apache.ws.security.SOAPConstants;
  import org.apache.ws.security.WSEncryptionPart;
  import org.apache.ws.security.WSSecurityException;
***************
*** 262,266 ****
  			WSConstants.ENC_NS);
  
! 		soapConstants = WSSecurityUtil.getSOAPConstants(envelope);			
  
  		/*
--- 263,267 ----
  			WSConstants.ENC_NS);
  
! 		SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(envelope);			
  
  		/*
***************
*** 449,453 ****
  			WSConstants.ENC_NS);
  
! 		soapConstants = WSSecurityUtil.getSOAPConstants(envelope);
  		/*
  		 * Second step: generate a symmetric key from the specified
--- 450,454 ----
  			WSConstants.ENC_NS);
  
! 		SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(envelope);
  		/*
  		 * Second step: generate a symmetric key from the specified

Index: WSSignEnvelope.java
===================================================================
RCS file: /cvsroot/wss4j/wss4j/src/org/apache/ws/security/message/WSSignEnvelope.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** WSSignEnvelope.java	21 Jan 2004 12:14:41 -0000	1.25
--- WSSignEnvelope.java	21 Jan 2004 13:21:37 -0000	1.26
***************
*** 58,61 ****
--- 58,62 ----
  import org.apache.commons.logging.LogFactory;
  import org.apache.ws.security.WSConstants;
+ import org.apache.ws.security.SOAPConstants;
  import org.apache.ws.security.WSEncryptionPart;
  import org.apache.ws.security.WSSecurityException;
***************
*** 177,181 ****
  
  		Element envelope = doc.getDocumentElement();
! 		soapConstants = WSSecurityUtil.getSOAPConstants(envelope);			
  		
          Element securityHeader = insertSecurityHeader(doc, true);
--- 178,182 ----
  
  		Element envelope = doc.getDocumentElement();
! 		SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(envelope);			
  		
          Element securityHeader = insertSecurityHeader(doc, true);




-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn