[WSS4J] wss4j/src/org/apache/ws/axis/security package.html,1.3,1.4 WSDoAllSender.java,1.19,1.20

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

Modified Files:
	package.html WSDoAllSender.java 
Log Message:
Add SOAP 1.2 handling. Most of the code shamelessly copied from Axis
and modified.

Index: package.html
===================================================================
RCS file: /cvsroot/wss4j/wss4j/src/org/apache/ws/axis/security/package.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** package.html	21 Dec 2003 15:26:50 -0000	1.3
--- package.html	21 Jan 2004 12:14:42 -0000	1.4
***************
*** 314,320 ****
      ...
      PingPort port = (PingPort) service.getPing1();
!     port._setProperty(UsernameToken.PASSWORD_TYPE, WSConstants.PASSWORD_TEXT);
!     port._setProperty(WSDoAllConstants.USER, "werner");
!     port._setProperty(WSDoAllConstants.PW_CALLBACK_REF, this);
      ...
    }
--- 314,320 ----
      ...
      PingPort port = (PingPort) service.getPing1();
!     ((org.apache.axis.client.Stub)port)._setProperty(UsernameToken.PASSWORD_TYPE, WSConstants.PASSWORD_TEXT);
!     ((org.apache.axis.client.Stub)port._setProperty(WSDoAllConstants.USER, "werner");
!     ((org.apache.axis.client.Stub)port._setProperty(WSDoAllConstants.PW_CALLBACK_REF, this);
      ...
    }

Index: WSDoAllSender.java
===================================================================
RCS file: /cvsroot/wss4j/wss4j/src/org/apache/ws/axis/security/WSDoAllSender.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** WSDoAllSender.java	22 Dec 2003 13:36:12 -0000	1.19
--- WSDoAllSender.java	21 Jan 2004 12:14:42 -0000	1.20
***************
*** 65,68 ****
--- 65,69 ----
  import org.apache.ws.axis.security.util.AxisUtil;
  import org.apache.ws.security.WSConstants;
+ import org.apache.ws.security.SOAPConstants;
  import org.apache.ws.security.WSEncryptionPart;
  import org.apache.ws.security.WSPasswordCallback;
***************
*** 73,76 ****
--- 74,78 ----
  import org.apache.ws.security.message.WSSAddUsernameToken;
  import org.apache.ws.security.message.WSSignEnvelope;
+ import org.apache.ws.security.util.WSSecurityUtil;
  import org.apache.xml.security.utils.XMLUtils;
  import org.w3c.dom.Document;
***************
*** 103,106 ****
--- 105,110 ----
  	private boolean noSerialization = false;
  	
+ 	private SOAPConstants soapConstants = null;
+ 	
  	String username = null;
  
***************
*** 222,225 ****
--- 226,230 ----
  			}
  		}
+ 		soapConstants = WSSecurityUtil.getSOAPConstants(doc.getDocumentElement());
  		/*
  		 * Here we have action, username, password, and actor, mustUnderstand.
***************
*** 683,687 ****
  					new WSEncryptionPart(
  						partDef[0],
! 						WSConstants.SOAP_NS,
  						"Content");
  			} else if (partDef.length == 3) {
--- 688,692 ----
  					new WSEncryptionPart(
  						partDef[0],
! 						soapConstants.getEnvelopeURI(),
  						"Content");
  			} else if (partDef.length == 3) {
***************
*** 694,698 ****
  				String nmSpace = partDef[1].substring(1);
  				if (nmSpace.length() == 0) {
! 					nmSpace = WSConstants.SOAP_NS;
  				}
  				String element = partDef[2].trim();
--- 699,703 ----
  				String nmSpace = partDef[1].substring(1);
  				if (nmSpace.length() == 0) {
! 					nmSpace = soapConstants.getEnvelopeURI();
  				}
  				String element = partDef[2].trim();




-------------------------------------------------------
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