[xgws-dev] CVS Update: codes/xsul/java/tests/xsul/async_msg

Aleksander Andrzej Slominski xgws-dev_at_extreme.indiana.edu
Tue Oct 3 11:44:01 2006


aslom       06/10/03 11:43:36

  Modified:    xsul/java/generated/java_interfaces/xsul/xpola/capman
                        CapmanPortType.java RequestmanPortType.java
               xsul/java/generated/java_interfaces/xsul/xpola/groupman
                        GroupmanPortType.java
               xsul/java/generated/xmlbeans_typelib xsul_typelib.jar
               xsul/java/modules/common/xsul XsulVersion.java
               xsul/java/modules/lead/xsul/lead lead-context.xsd
               xsul/java/modules/msg_box/xsul/msg_box/servlet
                        MsgBoxServlet.java
               xsul/java/tests/xsul/async_msg EchoAsyncClient.java
                        EchoPeerImpl.java
  Log:
  sync
  
  Revision  Changes    Path
  1.12      +1 -1      codes/xsul/java/generated/java_interfaces/xsul/xpola/capman/CapmanPortType.java
  
  Index: CapmanPortType.java
  ===================================================================
  RCS file: /l/extreme/cvs/codes/xsul/java/generated/java_interfaces/xsul/xpola/capman/CapmanPortType.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -t -w -r1.11 -r1.12
  --- CapmanPortType.java	5 Jun 2006 20:13:48 -0000	1.11
  +++ CapmanPortType.java	3 Oct 2006 15:43:35 -0000	1.12
  @@ -1,4 +1,4 @@
  -/* DO NOT MODIFY!!!! This file was generated automatically by xwsdlc (version 2.6.2_dev) */
  +/* DO NOT MODIFY!!!! This file was generated automatically by xwsdlc (version 2.7.7) */
   package xsul.xpola.capman;
   import javax.xml.namespace.QName;
   public interface CapmanPortType {
  
  
  
  1.7       +1 -1      codes/xsul/java/generated/java_interfaces/xsul/xpola/capman/RequestmanPortType.java
  
  Index: RequestmanPortType.java
  ===================================================================
  RCS file: /l/extreme/cvs/codes/xsul/java/generated/java_interfaces/xsul/xpola/capman/RequestmanPortType.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -t -w -r1.6 -r1.7
  --- RequestmanPortType.java	5 Jun 2006 20:13:48 -0000	1.6
  +++ RequestmanPortType.java	3 Oct 2006 15:43:35 -0000	1.7
  @@ -1,4 +1,4 @@
  -/* DO NOT MODIFY!!!! This file was generated automatically by xwsdlc (version 2.6.2_dev) */
  +/* DO NOT MODIFY!!!! This file was generated automatically by xwsdlc (version 2.7.7) */
   package xsul.xpola.capman;
   import javax.xml.namespace.QName;
   public interface RequestmanPortType {
  
  
  
  1.9       +1 -1      codes/xsul/java/generated/java_interfaces/xsul/xpola/groupman/GroupmanPortType.java
  
  Index: GroupmanPortType.java
  ===================================================================
  RCS file: /l/extreme/cvs/codes/xsul/java/generated/java_interfaces/xsul/xpola/groupman/GroupmanPortType.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -t -w -r1.8 -r1.9
  --- GroupmanPortType.java	5 Jun 2006 20:13:48 -0000	1.8
  +++ GroupmanPortType.java	3 Oct 2006 15:43:35 -0000	1.9
  @@ -1,4 +1,4 @@
  -/* DO NOT MODIFY!!!! This file was generated automatically by xwsdlc (version 2.6.2_dev) */
  +/* DO NOT MODIFY!!!! This file was generated automatically by xwsdlc (version 2.7.7) */
   package xsul.xpola.groupman;
   import javax.xml.namespace.QName;
   public interface GroupmanPortType {
  
  
  
  1.18      +4081 -2198codes/xsul/java/generated/xmlbeans_typelib/xsul_typelib.jar
  
  	<<Binary file>>
  
  
  1.92      +3 -3      codes/xsul/java/modules/common/xsul/XsulVersion.java
  
  Index: XsulVersion.java
  ===================================================================
  RCS file: /l/extreme/cvs/codes/xsul/java/modules/common/xsul/XsulVersion.java,v
  retrieving revision 1.91
  retrieving revision 1.92
  diff -u -b -t -w -r1.91 -r1.92
  --- XsulVersion.java	12 Sep 2006 22:12:14 -0000	1.91
  +++ XsulVersion.java	3 Oct 2006 15:43:35 -0000	1.92
  @@ -1,17 +1,17 @@
   /* -*- mode: Java; c-basic-offset: 4; indent-tabs-mode: nil; -*-  //------100-columns-wide------>|*/
   /* Copyright (c) 2002-2006 Extreme! Lab, Indiana University. All rights reserved.
    * This software is open source. See the bottom of this file for the licence.
  - * $Id: XsulVersion.java,v 1.91 2006/09/12 22:12:14 aslom Exp $ */
  + * $Id: XsulVersion.java,v 1.92 2006/10/03 15:43:35 aslom Exp $ */
   package xsul;
   
   /**
    * One place to put version number.
    *
  - * @version $Revision: 1.91 $
  + * @version $Revision: 1.92 $
    * @author <a href="http://www.extreme.indiana.edu/~aslom/">Aleksander Slominski</a>
    */
   public class XsulVersion {
  -    public final static String SPEC_VERSION = "2.7.6";
  +    public final static String SPEC_VERSION = "2.7.7";
       private final static String BUILD = ""; //"_dev"; //"_f2"; //"_SPECIAL_EDITION";//"_b4";
   
       private final static String PROJECT_NAME = "XSUL";
  
  
  
  1.5       +4 -4      codes/xsul/java/modules/lead/xsul/lead/lead-context.xsd
  
  Index: lead-context.xsd
  ===================================================================
  RCS file: /l/extreme/cvs/codes/xsul/java/modules/lead/xsul/lead/lead-context.xsd,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -t -w -r1.4 -r1.5
  --- lead-context.xsd	26 Sep 2006 17:17:53 -0000	1.4
  +++ lead-context.xsd	3 Oct 2006 15:43:36 -0000	1.5
  @@ -91,12 +91,12 @@
             <element minOccurs="0" maxOccurs="1" ref="lead:workflow-time-step"/>
             <element minOccurs="0" maxOccurs="1" ref="lead:service-instance-id"/>
             <element minOccurs="0" maxOccurs="1" ref="lead:gfac-url"/>
  +          <element minOccurs="0" maxOccurs="1" ref="lead:dsc-url"/>
             <element minOccurs="0" maxOccurs="1" ref="lead:resource-catalog-url"/>
             <element minOccurs="0" maxOccurs="1" ref="lead:event-sink-epr"/>
  -          <!-- this is required element to make open content model works!!!! -->
  -          <!-- for description see: -->
  -          <!-- http://www.xfront.com/ExtensibleContentModels.html -->
  -          <!-- http://www.xml.com/lpt/a/2002/07/03/schema_design.html -->
  +          <!-- this is required element to make open content model works (as much as it can be done in XS 1.0 ...)  -->
  +          <!-- for description see: http://www.xfront.com/ExtensibleContentModels.html -->
  +          <!-- and http://www.xml.com/lpt/a/2002/07/03/schema_design.html -->
             <element minOccurs="1" maxOccurs="1" ref="lead:user-dn"/>
             <any namespace="##any" minOccurs="0"/>
   <!--          <any namespace="##targetNamespace" processContents="strict"
  
  
  
  1.10      +1 -3      codes/xsul/java/modules/msg_box/xsul/msg_box/servlet/MsgBoxServlet.java
  
  Index: MsgBoxServlet.java
  ===================================================================
  RCS file: /l/extreme/cvs/codes/xsul/java/modules/msg_box/xsul/msg_box/servlet/MsgBoxServlet.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -t -w -r1.9 -r1.10
  --- MsgBoxServlet.java	1 May 2006 21:48:09 -0000	1.9
  +++ MsgBoxServlet.java	3 Oct 2006 15:43:36 -0000	1.10
  @@ -4,7 +4,7 @@
    *
    * This software is open source. See the bottom of this file for the licence.
    *
  - * $Id: MsgBoxServlet.java,v 1.9 2006/05/01 21:48:09 aslom Exp $
  + * $Id: MsgBoxServlet.java,v 1.10 2006/10/03 15:43:36 aslom Exp $
    */
   package xsul.msg_box.servlet;
   
  @@ -339,5 +339,3 @@
    * SOFTWARE.
    */
   
  -
  -
  
  
  
  1.10      +1 -1      codes/xsul/java/tests/xsul/async_msg/EchoAsyncClient.java
  
  Index: EchoAsyncClient.java
  ===================================================================
  RCS file: /l/extreme/cvs/codes/xsul/java/tests/xsul/async_msg/EchoAsyncClient.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -t -w -r1.9 -r1.10
  --- EchoAsyncClient.java	31 May 2006 07:31:09 -0000	1.9
  +++ EchoAsyncClient.java	3 Oct 2006 15:43:36 -0000	1.10
  @@ -106,7 +106,7 @@
               correlator = null;
           }
           
  -        // pass soem headers
  +        // pass LEAD headers
           LeadContextHeader leadContext = new LeadContextHeader("uid:experiment:233223", "cn=SomeUser");
           leadContext.setWorkflowId("http://host/2005/11/09/workflowinstace");
           leadContext.setNodeId("decoder1");
  
  
  
  1.6       +6 -4      codes/xsul/java/tests/xsul/async_msg/EchoPeerImpl.java
  
  Index: EchoPeerImpl.java
  ===================================================================
  RCS file: /l/extreme/cvs/codes/xsul/java/tests/xsul/async_msg/EchoPeerImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -t -w -r1.5 -r1.6
  --- EchoPeerImpl.java	18 Nov 2005 16:34:32 -0000	1.5
  +++ EchoPeerImpl.java	3 Oct 2006 15:43:36 -0000	1.6
  @@ -6,6 +6,7 @@
   import xsul.XmlConstants;
   import xsul.lead.LeadContextHeader;
   import xsul.xhandler_soap_sticky_header.StickySoapHeaderHandler;
  +import xsul.ws_addressing.WsaEndpointReference;
   
   public class EchoPeerImpl implements EchoPeer  {
       private final static MLogger logger = MLogger.getLogger();
  @@ -13,14 +14,15 @@
   
       public XmlElement echoString(XmlElement inputMsg) {
           
  -        LeadContextHeader nh = (LeadContextHeader) StickySoapHeaderHandler.
  +        LeadContextHeader leadContext = (LeadContextHeader) StickySoapHeaderHandler.
               getHeaderAs(LeadContextHeader.class, LeadContextHeader.TYPE);
  +        WsaEndpointReference eventSinkEpr = leadContext.getEventSink();
           //System.err.println("input "+builder.serializeToString(param0));
           XmlElement param0 = inputMsg.requiredElement(null, "param0");
  -        if(nh != null) {
  -            System.err.println("SERVICE got event sink : "+nh.getEventSink());
  +        if(leadContext != null) {
  +            System.err.println("SERVICE got event sink : "+leadContext.getEventSink());
               String s = param0.requiredTextContent();
  -            System.err.println("SERVICE will send notification "+s+" to "+nh.getEventSink());
  +            System.err.println("SERVICE will send notification "+s+" to "+leadContext.getEventSink());
           }
       
           inputMsg.setParent(null);