You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by di...@apache.org on 2004/04/18 19:22:57 UTC

cvs commit: ws-fx/wss4j/src/org/apache/ws/security WSConstants.java

dims        2004/04/18 10:22:57

  Modified:    wss4j/interop/org/apache/ws/axis/oasis Client_deploy.wsdd
               wss4j/interop ping.wsdl
               wss4j/src/org/apache/ws/security/transform STRTransform.java
               wss4j/src/org/apache/ws/security WSConstants.java
  Log:
  Update implementation with "correct" namespaces. May break interop till others catch up.
  
  Revision  Changes    Path
  1.18      +1 -1      ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd
  
  Index: Client_deploy.wsdd
  ===================================================================
  RCS file: /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Client_deploy.wsdd	18 Mar 2004 14:30:38 -0000	1.17
  +++ Client_deploy.wsdd	18 Apr 2004 17:22:56 -0000	1.18
  @@ -44,7 +44,7 @@
       <!-- Use the Server's cert/key to encrypt the request -->
       <parameter name="encryptionUser" value="86ab6c4828bcde6983d81b2b59ff426c_a8272f6f-2c94-436e-aa71-d8d2be4647f6" />
       <parameter name="encryptionParts" 
  -      value="{Element}{http://www.docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}UsernameToken" />  
  +      value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}UsernameToken" />  
      </handler>
     </requestFlow>
     </service>
  
  
  
  1.5       +3 -3      ws-fx/wss4j/interop/ping.wsdl
  
  Index: ping.wsdl
  ===================================================================
  RCS file: /home/cvs/ws-fx/wss4j/interop/ping.wsdl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ping.wsdl	11 Mar 2004 14:23:49 -0000	1.4
  +++ ping.wsdl	18 Apr 2004 17:22:56 -0000	1.5
  @@ -1,4 +1,4 @@
  -<definitions xmlns:s1="http://www.docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
  +<definitions xmlns:s1="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
                xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
                xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
                xmlns:s="http://www.w3.org/2001/XMLSchema"
  @@ -10,7 +10,7 @@
                xmlns="http://schemas.xmlsoap.org/wsdl/">
       <types>
           <s:schema elementFormDefault="qualified" targetNamespace="http://xmlsoap.org/Ping">
  -            <s:import namespace="http://www.docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
  +            <s:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
               <s:element name="Ping" nillable="true" type="tns:ping"/>
               <s:complexType name="ping">
                   <s:sequence>
  @@ -32,7 +32,7 @@
                   </s:sequence>
               </s:complexType>
           </s:schema>
  -        <s:schema elementFormDefault="qualified" targetNamespace="http://www.docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
  +        <s:schema elementFormDefault="qualified" targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
               <s:attribute name="Id" type="s:string"/>
           </s:schema>
       </types>
  
  
  
  1.12      +1 -1      ws-fx/wss4j/src/org/apache/ws/security/transform/STRTransform.java
  
  Index: STRTransform.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/wss4j/src/org/apache/ws/security/transform/STRTransform.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- STRTransform.java	17 Mar 2004 18:50:08 -0000	1.11
  +++ STRTransform.java	18 Apr 2004 17:22:56 -0000	1.12
  @@ -65,7 +65,7 @@
   
   	/** Field implementedTransformURI */
   	public static final String implementedTransformURI =
  -		"http://www.docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#STR-Transform";
  +		"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#STR-Transform";
   
   
   	private static Log log = LogFactory.getLog(STRTransform.class.getName());
  
  
  
  1.14      +4 -4      ws-fx/wss4j/src/org/apache/ws/security/WSConstants.java
  
  Index: WSConstants.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/wss4j/src/org/apache/ws/security/WSConstants.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- WSConstants.java	7 Apr 2004 05:56:17 -0000	1.13
  +++ WSConstants.java	18 Apr 2004 17:22:56 -0000	1.14
  @@ -25,10 +25,10 @@
    * Constants in WS-Security spec.
    */
   public interface WSConstants {
  -    public static final String WSSE_NS = "http://www.docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
  -    public static final String USERNAMETOKEN_NS = "http://www.docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0";
  -    public static final String SOAPMESSAGE_NS = "http://www.docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0";
  -    public static final String X509TOKEN_NS = "http://www.docs.oasis-open.org/wss/2003/12/oasis-200401-wss-x509-token-profile-1.0";
  +    public static final String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
  +    public static final String USERNAMETOKEN_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0";
  +    public static final String SOAPMESSAGE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0";
  +    public static final String X509TOKEN_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0";
       public static final String WSSE_PREFIX = "wsse";
       public static final String WSSE_LN = "Security";
       public static final String WSU_NS = "http://www.docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";