[xgws-dev] CVS Update: codes/xsul/java/lib/ant

Aleksander Andrzej Slominski xgws-dev_at_extreme.indiana.edu
Fri Nov 10 19:27:01 2006


aslom       06/11/10 19:26:54

  Modified:    xsul/java/modules/common/xsul/util XsulUtil.java
               xsul/java/modules/lead/xsul/lead LeadContextHeader.java
                        LeadCrosscutParametersUtil.java
                        LeadResourceMapping.java lead-context.xsd
  Added:       xsul/java/lib/ant ant.jar
  Log:
  added ant libs
  sync
  
  Revision  Changes    Path
  1.3       +53 -46    codes/xsul/java/modules/common/xsul/util/XsulUtil.java
  
  Index: XsulUtil.java
  ===================================================================
  RCS file: /l/extreme/cvs/codes/xsul/java/modules/common/xsul/util/XsulUtil.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -t -w -r1.2 -r1.3
  --- XsulUtil.java	1 Nov 2006 16:59:52 -0000	1.2
  +++ XsulUtil.java	11 Nov 2006 00:26:54 -0000	1.3
  @@ -4,7 +4,7 @@
    *
    * This software is open source. See the bottom of this file for the licence.
    *
  - * $Id: XsulUtil.java,v 1.2 2006/11/01 16:59:52 aslom Exp $
  + * $Id: XsulUtil.java,v 1.3 2006/11/11 00:26:54 aslom Exp $
    */
   
   package xsul.util;
  @@ -13,7 +13,7 @@
   /**
    * Utility methods shared by all clases in package.
    *
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    * @author <a href="http://www.extreme.indiana.edu/~aslom/">Aleksander Slominski</a>
    */
   import java.io.ByteArrayOutputStream;
  @@ -86,6 +86,13 @@
           return safeSerializeXmlItem(el);
       }
       
  +    /**
  +     * It is safe serialization in sense that non XML serializable content is represented as toString()
  +     * and no exception is thrown (so one can even print Thread to XML).
  +     * <br />NOTE: use this and related methods for debugging purposes only!!!
  +     * <br />NOTE: this method is not suitable to generate correct XML
  +     * (output from toString() may be hard or impossible to deserialize !!!!)
  +     */
       public static String safeSerializeXmlItem(Object item) {
           StringWriter sw = new StringWriter();
           XmlSerializer ser = preapareSerializer(sw);
  @@ -128,9 +135,9 @@
       }
       
       /**
  -     * It is safe serialization in sense that non XML serializable content is represnted as toString()
  +     * It is safe serialization in sense that non XML serializable content is represented as toString()
        * and no exception is thrown (so one can even print Thread to XML).
  -     * <br />NOTE: use this and related methods for debuggin purposes only!!!
  +     * <br />NOTE: use this and related methods for debugging purposes only!!!
        * <br />NOTE: this method is not suitable to generate correct XML
        * (output from toString() may be hard or impossible to deserialize !!!!)
        */
  
  
  
  1.24      +8 -3      codes/xsul/java/modules/lead/xsul/lead/LeadContextHeader.java
  
  Index: LeadContextHeader.java
  ===================================================================
  RCS file: /l/extreme/cvs/codes/xsul/java/modules/lead/xsul/lead/LeadContextHeader.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -b -t -w -r1.23 -r1.24
  --- LeadContextHeader.java	9 Nov 2006 06:05:09 -0000	1.23
  +++ LeadContextHeader.java	11 Nov 2006 00:26:54 -0000	1.24
  @@ -1,7 +1,7 @@
   /* -*- mode: Java; c-basic-offset: 4; indent-tabs-mode: nil; -*-  //------100-columns-wide------>|*/
   /* Copyright (c) 2002-2005 Extreme! Lab, Indiana University. All rights reserved.
    * This software is open source. See the bottom of this file for the licence.
  - * $Id: LeadContextHeader.java,v 1.23 2006/11/09 06:05:09 aslom Exp $ */
  + * $Id: LeadContextHeader.java,v 1.24 2006/11/11 00:26:54 aslom Exp $ */
   package xsul.lead;
   
   import java.net.URI;
  @@ -28,6 +28,7 @@
   
       public final static String EXPERIMENT_ID = "experiment-id";
       public final static String WORKFLOW_INSTANCE_ID = "workflow-instance-id";
  +    public final static String WORKFLOW_TEMPLATE_ID = "workflow-template-id";
       public final static String NODE_ID = "workflow-node-id";
       public final static String TIME_STEP = "workflow-time-step";
       public final static String SERVICE_INSTANCE_ID = "service-instance-id";
  @@ -62,8 +63,12 @@
   
       public void setExperimentId(String experimentId) { setStringValue(NS, EXPERIMENT_ID, experimentId); }
       public String getExperimentId() { return getString(NS, EXPERIMENT_ID); }
  -    public void setWorkflowId(URI workflowId) { setUriValue(NS, WORKFLOW_INSTANCE_ID, workflowId); }
  -    public URI getWorkflowId() { return lookupUriValue(NS, WORKFLOW_INSTANCE_ID); }
  +    public void setWorkflowId(URI workflowId) { setWorkflowInstanceId(workflowId); }
  +    public URI getWorkflowId() { return getWorkflowInstanceId(); }
  +    public void setWorkflowInstanceId(URI workflowId) { setUriValue(NS, WORKFLOW_INSTANCE_ID, workflowId); }
  +    public URI getWorkflowInstanceId() { return lookupUriValue(NS, WORKFLOW_INSTANCE_ID); }
  +    public void setWorkflowTemplateId(URI workflowId) { setUriValue(NS, WORKFLOW_TEMPLATE_ID, workflowId); }
  +    public URI getWorkflowTemplateId() { return lookupUriValue(NS, WORKFLOW_TEMPLATE_ID); }
       public void setNodeId(String nodeId) { setStringValue(NS, NODE_ID, nodeId); }
       public String getNodeId() { return getString(NS, NODE_ID); }
       public void setTimeStep(String timeStep) { setStringValue(NS, TIME_STEP, timeStep); }
  
  
  
  1.6       +12 -12    codes/xsul/java/modules/lead/xsul/lead/LeadCrosscutParametersUtil.java
  
  Index: LeadCrosscutParametersUtil.java
  ===================================================================
  RCS file: /l/extreme/cvs/codes/xsul/java/modules/lead/xsul/lead/LeadCrosscutParametersUtil.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -t -w -r1.5 -r1.6
  --- LeadCrosscutParametersUtil.java	6 Nov 2006 14:45:54 -0000	1.5
  +++ LeadCrosscutParametersUtil.java	11 Nov 2006 00:26:54 -0000	1.6
  @@ -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: LeadCrosscutParametersUtil.java,v 1.5 2006/11/06 14:45:54 machrist Exp $ */
  + * $Id: LeadCrosscutParametersUtil.java,v 1.6 2006/11/11 00:26:54 aslom Exp $ */
   package xsul.lead;
   
   import java.util.Properties;
  @@ -16,7 +16,7 @@
   import xsul.xbeans_util.XBeansUtil;
   
   /**
  - * Conveneint set of constants and methods to access corss cutting parameters without XmlBeans
  + * Convenient set of constants and methods to access corss cutting parameters without XmlBeans
    */
   public class LeadCrosscutParametersUtil extends XmlNameValueList {
       private final static MLogger logger = MLogger.getLogger();
  
  
  
  1.6       +11 -11    codes/xsul/java/modules/lead/xsul/lead/LeadResourceMapping.java
  
  Index: LeadResourceMapping.java
  ===================================================================
  RCS file: /l/extreme/cvs/codes/xsul/java/modules/lead/xsul/lead/LeadResourceMapping.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -t -w -r1.5 -r1.6
  --- LeadResourceMapping.java	7 Nov 2006 21:16:12 -0000	1.5
  +++ LeadResourceMapping.java	11 Nov 2006 00:26:54 -0000	1.6
  @@ -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: LeadResourceMapping.java,v 1.5 2006/11/07 21:16:12 aslom Exp $ */
  + * $Id: LeadResourceMapping.java,v 1.6 2006/11/11 00:26:54 aslom Exp $ */
   package xsul.lead;
   
   import java.net.URI;
  
  
  
  1.13      +6 -0      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.12
  retrieving revision 1.13
  diff -u -b -t -w -r1.12 -r1.13
  --- lead-context.xsd	9 Nov 2006 06:05:09 -0000	1.12
  +++ lead-context.xsd	11 Nov 2006 00:26:54 -0000	1.13
  @@ -19,6 +19,12 @@
         </documentation></annotation>
       </element>
   
  +    <element name="workflow-template-id" type="anyURI">
  +      <annotation><documentation xml:lang="en">
  +        URI that identifies workflow template that was used to create this workflow instance. (optional)
  +      </documentation></annotation>
  +    </element>
  +
       <element name="workflow-node-id" type="string">
         <annotation><documentation xml:lang="en">
           String that identifies uniqueley a node in workflow graph that originated that message. (optional)
  
  
  
  1.1                  codes/xsul/java/lib/ant/ant.jar
  
  	<<Binary file>>