[xgws-dev] CVS Update: codes/xsul/java/samples/simplesoap/contract

Aleksander Andrzej Slominski xgws-dev_at_extreme.indiana.edu
Wed Apr 19 13:39:01 2006


aslom       06/04/19 13:38:15

  Modified:    xsul/java/doc changes.html
               xsul/java/modules/ws_addressing/xsul/ws_addressing
                        WsAddressing.java WsaEndpointReference.java
               xsul/java/modules/ws_addressing_converter/xsul/ws_addressing
                        WsaConverter.java
               xsul/java/modules/xhandler_soap_sticky_header/xsul/xhandler_soap_sticky_header
                        StickySoapHeaderHandler.java
               xsul/java/modules/xhandler_wsa_convert/xsul/xhandler_wsa_convert
                        ServerWsaConversionHandler.java
               xsul/java/samples/simplesoap/contract CommonConstants.java
  Log:
  sync
  
  Revision  Changes    Path
  1.43      +14 -0     codes/xsul/java/doc/changes.html
  
  Index: changes.html
  ===================================================================
  RCS file: /l/extreme/cvs/codes/xsul/java/doc/changes.html,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -b -t -w -r1.42 -r1.43
  --- changes.html	18 Apr 2006 19:22:58 -0000	1.42
  +++ changes.html	19 Apr 2006 17:38:14 -0000	1.43
  @@ -14,6 +14,20 @@
   
   <ul>
   
  +<li>2006-04-19: modules/xhandler_wsa_convert
  +WsAddressingConverterHandler
  +</li>
  +
  +<li>2006-04-19: modules/xhandler_drop_repeated_wsa_msg
  +DropDuplicateMessageHandler
  +</li>
  +
  +<li>2006-04-19: modules/ws_adressing_detect_duplicates
  +</li>
  +
  +<li>2006-04-19: modules/
  +</li>
  +
   <li>2006-04-18: modules/xwsif_provider_xsul_soap_gsi
   new WSIF provider that can use GSI credentials to open https:// connection
   </li>
  
  
  
  1.12      +3 -2      codes/xsul/java/modules/ws_addressing/xsul/ws_addressing/WsAddressing.java
  
  Index: WsAddressing.java
  ===================================================================
  RCS file: /l/extreme/cvs/codes/xsul/java/modules/ws_addressing/xsul/ws_addressing/WsAddressing.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -t -w -r1.11 -r1.12
  --- WsAddressing.java	18 Apr 2006 19:40:32 -0000	1.11
  +++ WsAddressing.java	19 Apr 2006 17:38:14 -0000	1.12
  @@ -4,7 +4,7 @@
    *
    * This software is open source. See the bottom of this file for the licence.
    *
  - * $Id: WsAddressing.java,v 1.11 2006/04/18 19:40:32 aslom Exp $
  + * $Id: WsAddressing.java,v 1.12 2006/04/19 17:38:14 aslom Exp $
    */
   
   package xsul.ws_addressing;
  @@ -20,7 +20,7 @@
    * <a href="http://www-106.ibm.com/developerworks/webservices/library/ws-add/">WS-Addressing</a>
    * and this class contains some shared constants.
    *
  - * @version $Revision: 1.11 $
  + * @version $Revision: 1.12 $
    * @author <a href="http://www.extreme.indiana.edu/~aslom/">Aleksander Slominski</a>
    */
   public class WsAddressing {
  @@ -29,6 +29,7 @@
       // "final" WSA 1.0 version from http://www.w3.org/2002/ws/addr/
       public final static XmlNamespace NS_2005 = builder.newNamespace(
           "wa", "http://www.w3.org/2005/08/addressing");
  +    public final static XmlNamespace NS_WSA_10 = NS_2005;
       public final static XmlNamespace NS_2004_08 = builder.newNamespace(
           "wa48", "http://schemas.xmlsoap.org/ws/2004/08/addressing");
       public final static XmlNamespace NS_2004_03 = builder.newNamespace(
  
  
  
  1.15      +4 -4      codes/xsul/java/modules/ws_addressing/xsul/ws_addressing/WsaEndpointReference.java
  
  Index: WsaEndpointReference.java
  ===================================================================
  RCS file: /l/extreme/cvs/codes/xsul/java/modules/ws_addressing/xsul/ws_addressing/WsaEndpointReference.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -t -w -r1.14 -r1.15
  --- WsaEndpointReference.java	18 Apr 2006 18:03:47 -0000	1.14
  +++ WsaEndpointReference.java	19 Apr 2006 17:38:14 -0000	1.15
  @@ -4,7 +4,7 @@
    *
    * This software is open source. See the bottom of this file for the licence.
    *
  - * $Id: WsaEndpointReference.java,v 1.14 2006/04/18 18:03:47 aslom Exp $
  + * $Id: WsaEndpointReference.java,v 1.15 2006/04/19 17:38:14 aslom Exp $
    */
   
   package xsul.ws_addressing;
  @@ -43,7 +43,7 @@
    * <a href="http://www-106.ibm.com/developerworks/webservices/library/ws-add/#informationmodelforendpointreferences">Endpoint Reference</a>
    * from Web Services Addressing (WS-Addressing)
    *
  - * @version $Revision: 1.14 $
  + * @version $Revision: 1.15 $
    * @author <a href="http://www.extreme.indiana.edu/~aslom/">Aleksander Slominski</a>
    */
   public class WsaEndpointReference extends XmlElementAdapter implements DataValidation
  @@ -70,6 +70,8 @@
       
       public WsaEndpointReference(XmlElement target) {
           super(target);
  +        //this.wa = target.getNamespace(); //HACKish
  +        this.wa = WsAddressing.getDefaultNs();
           validateData();
       }
       
  @@ -150,8 +152,6 @@
           return null;
       }
       
  -    
  -    
       public void validateData() throws DataValidationException {
           if(getAddress() == null) {
               throw new DataValidationException("wsa:Address is required in "+this);
  
  
  
  1.3       +7 -6      codes/xsul/java/modules/ws_addressing_converter/xsul/ws_addressing/WsaConverter.java
  
  Index: WsaConverter.java
  ===================================================================
  RCS file: /l/extreme/cvs/codes/xsul/java/modules/ws_addressing_converter/xsul/ws_addressing/WsaConverter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -t -w -r1.2 -r1.3
  --- WsaConverter.java	19 Apr 2006 15:05:24 -0000	1.2
  +++ WsaConverter.java	19 Apr 2006 17:38:14 -0000	1.3
  @@ -1,7 +1,7 @@
   /* -*- mode: Java; c-basic-offset: 4; indent-tabs-mode: nil; -*-  //------100-columns-wide------>|*/
   /* Copyright (c) 2006 Extreme! Lab, Indiana University. All rights reserved.
    * This software is open source. See the bottom of this file for the licence.
  - * $Id: WsaConverter.java,v 1.2 2006/04/19 15:05:24 aslom Exp $ */
  + * $Id: WsaConverter.java,v 1.3 2006/04/19 17:38:14 aslom Exp $ */
   
   package xsul.ws_addressing;
   
  @@ -18,13 +18,14 @@
   /**
    * Convert between version of WS-Addressing.
    *
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    * @author <a href="http://www.extreme.indiana.edu/~aslom/">Aleksander Slominski</a>
    */
   public class WsaConverter {
       private final static XmlInfosetBuilder builder = XmlConstants.BUILDER;
  -    public final static XmlNamespace CONVERTER_EL_NS = builder.newNamespace("some-ns", "wsac");
  -    public final static String CONVERTER_EL_NAME = "target-namespace";
  +    public final static XmlNamespace CONVERTER_EL_NS = builder.newNamespace(
  +        "http://www.extreme.indiana.edu/xgws/xsul/2006/", "xwsa");
  +    public final static String CONVERTER_EL_NAME = "message-wsa-namespace";
       public final static String CONVERTER_PREFIX_ATTR = "prefix";
       private final static String[] recognizedWsaNamespaces = new String[] {
           WsAddressing.NS_2005.getNamespaceName(),
  @@ -32,7 +33,7 @@
               WsAddressing.NS_2004_03.getNamespaceName(),
       };
       
  -    public static XmlNamespace getTargetNamespaceFromContext(XmlElement context) {
  +    public static XmlNamespace getOldNamespaceFromContext(XmlElement context) {
           if(context == null) {
               return null;
           }
  @@ -49,7 +50,7 @@
           return n;
       }
       
  -    public static void setTargetNamespaceInContext(XmlElement context, XmlNamespace targetNs) {
  +    public static void setOldNamespaceInContext(XmlElement context, XmlNamespace targetNs) {
           if(context == null) {
               throw new IllegalArgumentException();
           }
  
  
  
  1.2       +0 -1      codes/xsul/java/modules/xhandler_soap_sticky_header/xsul/xhandler_soap_sticky_header/StickySoapHeaderHandler.java
  
  Index: StickySoapHeaderHandler.java
  ===================================================================
  RCS file: /l/extreme/cvs/codes/xsul/java/modules/xhandler_soap_sticky_header/xsul/xhandler_soap_sticky_header/StickySoapHeaderHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -t -w -r1.1 -r1.2
  --- StickySoapHeaderHandler.java	16 Jun 2005 08:19:56 -0000	1.1
  +++ StickySoapHeaderHandler.java	19 Apr 2006 17:38:15 -0000	1.2
  @@ -30,7 +30,6 @@
    * for outgoing message to avoid memory leaking).
    */
   public class StickySoapHeaderHandler extends BaseHandler {
  -    
       private final static MLogger logger = MLogger.getLogger();
       private final static XmlInfosetBuilder builder = XmlConstants.BUILDER;
       
  
  
  
  1.2       +3 -3      codes/xsul/java/modules/xhandler_wsa_convert/xsul/xhandler_wsa_convert/ServerWsaConversionHandler.java
  
  Index: ServerWsaConversionHandler.java
  ===================================================================
  RCS file: /l/extreme/cvs/codes/xsul/java/modules/xhandler_wsa_convert/xsul/xhandler_wsa_convert/ServerWsaConversionHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -t -w -r1.1 -r1.2
  --- ServerWsaConversionHandler.java	19 Apr 2006 17:33:02 -0000	1.1
  +++ ServerWsaConversionHandler.java	19 Apr 2006 17:38:15 -0000	1.2
  @@ -1,8 +1,7 @@
  -
   /* -*- mode: Java; c-basic-offset: 4; indent-tabs-mode: nil; -*-  //------100-columns-wide------>|*/
   /* Copyright (c) 2006 Extreme! Lab, Indiana University. All rights reserved.
    * This software is open source. See the bottom of this file for the licence.
  - * $Id: ServerWsaConversionHandler.java,v 1.1 2006/04/19 17:33:02 aslom Exp $ */
  + * $Id: ServerWsaConversionHandler.java,v 1.2 2006/04/19 17:38:15 aslom Exp $ */
   
   package xsul.xhandler_wsa_convert;
   
  @@ -24,7 +23,7 @@
    * to WSA 1.0, the original version is stored in context and used for outgoing
    * message convert it from WSA 1.0 to that version.
    *
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    * @author <a href="http://www.extreme.indiana.edu/~aslom/">Aleksander Slominski</a>
    */
   public class ServerWsaConversionHandler extends BaseHandler {
  @@ -117,3 +116,4 @@
    * SOFTWARE.
    */
   
  +
  
  
  
  1.2       +3 -15     codes/xsul/java/samples/simplesoap/contract/CommonConstants.java
  
  Index: CommonConstants.java
  ===================================================================
  RCS file: /l/extreme/cvs/codes/xsul/java/samples/simplesoap/contract/CommonConstants.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -t -w -r1.1 -r1.2
  --- CommonConstants.java	31 Jan 2005 07:59:30 -0000	1.1
  +++ CommonConstants.java	19 Apr 2006 17:38:15 -0000	1.2
  @@ -4,27 +4,15 @@
    *
    * This software is open source. See the bottom of this file for the licence.
    *
  - * $Id: CommonConstants.java,v 1.1 2005/01/31 07:59:30 aslom Exp $
  + * $Id: CommonConstants.java,v 1.2 2006/04/19 17:38:15 aslom Exp $
    */
   package simplesoap.contract;
   
   
  -import java.util.Iterator;
  -import org.xmlpull.v1.builder.XmlElement;
  -import xsul.MLogger;
  -import xsul.invoker.DynamicInfosetInvokerException;
  -import xsul.message_router.MessageContext;
  -import xsul.passwd.PasswordEnforcer;
  -import xsul.wsdl.WsdlPort;
  -import xsul.wsdl.WsdlUtil;
  -import xsul.xhandler.BaseHandler;
  -import xsul.xhandler.XHandlerContext;
  -
  -
   /**
  - * Some share cosntants.
  + * Some shared constants.
    *
  - * $Id: CommonConstants.java,v 1.1 2005/01/31 07:59:30 aslom Exp $
  + * $Id: CommonConstants.java,v 1.2 2006/04/19 17:38:15 aslom Exp $
    */
   public interface CommonConstants {
       public final static String FEATURE_PASSWORD = "http://www.extreme.indiana.edu/xgws/xsul/2005-password";