ObjectWeb Consortium
Search ObjectWeb Mail Archive: 

Advanced Search - Powered by Google


Mail Archive Home | cow-commits List | March 2005 Index

<--  Date Index  --> <--  Thread Index  -->

CVS update of cow/ejb/src/org/objectweb/cow/WorkflowModel (9 files)


    Date: Friday, March 11, 2005 @ 10:04:22
  Author: moisev
    Path: /cvsroot/cow/cow/ejb/src/org/objectweb/cow/WorkflowModel

Modified: WfActivityBean.java WfActivityModelBean.java
          WfExecutionObjectImpl.java WfModel.java WfProcessBean.java
          WfProcessMgrBean.java WfProcessModelBean.java WfTaskBean.java
          WfToolAgentBean.java


----------------------------+
 WfActivityBean.java        |   37 +++++---------------------
 WfActivityModelBean.java   |    4 +-
 WfExecutionObjectImpl.java |   16 +++++------
 WfModel.java               |   56 ++++++++++++++++++++--------------------
 WfProcessBean.java         |   51 +++++++++++++++++++++++++++++--------
 WfProcessMgrBean.java      |   28 ++++++++++----------
 WfProcessModelBean.java    |    5 ++-
 WfTaskBean.java            |   59 ++++++++++++++++++++++++++++++++++++++++---
 WfToolAgentBean.java       |   25 +++++++++++++++++-
 9 files changed, 185 insertions(+), 96 deletions(-)


Index: cow/ejb/src/org/objectweb/cow/WorkflowModel/WfActivityBean.java
diff -u cow/ejb/src/org/objectweb/cow/WorkflowModel/WfActivityBean.java:1.7 
cow/ejb/src/org/objectweb/cow/WorkflowModel/WfActivityBean.java:1.8
--- cow/ejb/src/org/objectweb/cow/WorkflowModel/WfActivityBean.java:1.7 Mon 
Aug 30 22:28:38 2004
+++ cow/ejb/src/org/objectweb/cow/WorkflowModel/WfActivityBean.java     Fri 
Mar 11 10:04:22 2005
@@ -20,7 +20,7 @@
 * Initial developer(s): Yvan PETER                                     *
 * Contributor(s): Thomas VANTROYS, Nicolas VAURETTE                    *
 *                                                                      *
-* $Id: WfActivityBean.java,v 1.7 2004/08/30 20:28:38 moisev Exp $
+* $Id: WfActivityBean.java,v 1.8 2005/03/11 09:04:22 moisev Exp $
 *=====================================================================*/
 package org.objectweb.cow.WorkflowModel;
 
@@ -31,6 +31,7 @@
 import org.objectweb.cow.WorkflowModel.metamodel.ParticipantType;
 import org.objectweb.cow.WorkflowModel.metamodel.Tool;
 import org.objectweb.cow.WorkflowModel.metamodel.WorkItem;
+
 import org.objectweb.cow.facade.ProcessManager;
 import org.objectweb.cow.facade.ProcessManagerHome;
 
@@ -393,7 +394,6 @@
     if (isRoute)
     {
     }
-
     //         else if ( isDynamic )
     //                 createDynamic();
     else if (isSubflow)
@@ -411,27 +411,6 @@
     {
       createWorkItems();
     }
-
-    /*
-                    // Determine the Activity Type
-                    if ( isRoute )
-                    {
-                    }
-                    else if ( isSubflow )
-                    {
-                            createSubflow();
-                    }
-                    else if ( hasWorkItem )
-                    {
-                            createWorkItem();
-                    }
-                    else
-                    {
-                            createTasks();
-    //                        createActivityAttributes();
-    //                        createActivityFormalParameters()
-                    }
-    */
     createActivityValidatedBy();
 
     try
@@ -1265,8 +1244,8 @@
   }
 
   /**
-   *  @ejb.interface-method view-type="both"
-  */
+   * @ejb.interface-method view-type="both"
+   */
   public void receive_event(WfEventAudit event)
   {
     String evt;
@@ -2448,11 +2427,11 @@
 
   public void ejbLoad()
   {
-         System.out.println("WfActivity: ejbLoad: Debut");
+//       System.out.println("WfActivity: ejbLoad: Debut");
     loadWfActivityModel();
-       System.out.println("WfActivity: ejbLoad: loadWfActivityModel");
+//     System.out.println("WfActivity: ejbLoad: loadWfActivityModel");
     loadWfActivityInstance();
-       System.out.println("WfActivity: ejbLoad: loadWfActivityInstance");
+//     System.out.println("WfActivity: ejbLoad: loadWfActivityInstance");
 
     activityModelManager = new ActivityModelManager2(activityModel,
         activityInstance);
@@ -2463,7 +2442,7 @@
     isRoute = activityModelManager.isRoute();
 
     query = "WfActivity = " + getIdWfActivity();
-         System.out.println("WfActivity: ejbLoad: Fin");
+//       System.out.println("WfActivity: ejbLoad: Fin");
   }
 
   public void ejbStore()
Index: cow/ejb/src/org/objectweb/cow/WorkflowModel/WfActivityModelBean.java
diff -u 
cow/ejb/src/org/objectweb/cow/WorkflowModel/WfActivityModelBean.java:1.2 
cow/ejb/src/org/objectweb/cow/WorkflowModel/WfActivityModelBean.java:1.3
--- cow/ejb/src/org/objectweb/cow/WorkflowModel/WfActivityModelBean.java:1.2  
  Thu Oct  9 16:33:26 2003
+++ cow/ejb/src/org/objectweb/cow/WorkflowModel/WfActivityModelBean.java      
  Fri Mar 11 10:04:22 2005
@@ -20,7 +20,7 @@
 * Initial developer(s): Thomas VANTROYS                                *
 * Contributor(s): Nicolas VAURETTE, Yvan PETER                         *
 *                                                                      *
-* $Id: WfActivityModelBean.java,v 1.2 2003/10/09 14:33:26 ypeter Exp $
+* $Id: WfActivityModelBean.java,v 1.3 2005/03/11 09:04:22 moisev Exp $
 *=====================================================================*/
 package org.objectweb.cow.WorkflowModel;
 
@@ -43,7 +43,7 @@
  *
  * @ejb.bean name="WfActivityModel"
  *           local-jndi-name="wfActivityModelHome_L"
- *           view-type="local"
+ *           view-type="both"
  *           type="CMP"
  *           reentrant="true"
  *           cmp-version="2.x"
Index: cow/ejb/src/org/objectweb/cow/WorkflowModel/WfExecutionObjectImpl.java
diff -u 
cow/ejb/src/org/objectweb/cow/WorkflowModel/WfExecutionObjectImpl.java:1.2 
cow/ejb/src/org/objectweb/cow/WorkflowModel/WfExecutionObjectImpl.java:1.3
--- 
cow/ejb/src/org/objectweb/cow/WorkflowModel/WfExecutionObjectImpl.java:1.2  
Tue Mar 30 18:21:31 2004
+++ cow/ejb/src/org/objectweb/cow/WorkflowModel/WfExecutionObjectImpl.java    
  Fri Mar 11 10:04:22 2005
@@ -18,9 +18,9 @@
 * USA                                                                  *
 *                                                                      *
 * Initial developer(s): Yvan PETER                                     *
-* Contributor(s):                                                      *
+* Contributor(s): Thomas VANTROYS                                      *
 *                                                                      *
-* $Id: WfExecutionObjectImpl.java,v 1.2 2004/03/30 16:21:31 moisev Exp $
+* $Id: WfExecutionObjectImpl.java,v 1.3 2005/03/11 09:04:22 moisev Exp $
 *=====================================================================*/
 package org.objectweb.cow.WorkflowModel;
 
@@ -155,8 +155,8 @@
    * @return the process instance key
    *
    * @throws org.omg.WfBase.BaseException If an error occurs
-       *
-       * @ejb.interface-method
+   *
+   * @ejb.interface-method
    */
   public String key() throws BaseException
   {
@@ -169,8 +169,8 @@
    * @return the process instance description
    *
    * @throws org.omg.WfBase.BaseException If an error occurs
-       *
-       * @ejb.interface-method
+   *
+   * @ejb.interface-method
    */
   public String description() throws BaseException
   {
@@ -210,10 +210,10 @@
    * @param new_value the new priority
    *
    * @throws org.omg.WfBase.BaseException If an error occurs
-   * @throws org.omg.WorkflowModel.InvalidPriority If the priority is not 
int the allowed range (1-5)
+   * @throws org.omg.WorkflowModel.InvalidPriority If the priority is not in 
the allowed range (1-5)
    * @throws org.omg.WorkflowModel.UpdateNotAllowed
    *
-       * @ejb.interface-method
+   * @ejb.interface-method
    */
   public void set_priority(short new_value)
     throws BaseException, InvalidPriority, UpdateNotAllowed
Index: cow/ejb/src/org/objectweb/cow/WorkflowModel/WfModel.java
diff -u cow/ejb/src/org/objectweb/cow/WorkflowModel/WfModel.java:1.2 
cow/ejb/src/org/objectweb/cow/WorkflowModel/WfModel.java:1.3
--- cow/ejb/src/org/objectweb/cow/WorkflowModel/WfModel.java:1.2        Thu 
Oct  9 16:33:26 2003
+++ cow/ejb/src/org/objectweb/cow/WorkflowModel/WfModel.java    Fri Mar 11 
10:04:22 2005
@@ -20,7 +20,7 @@
 * Initial developer(s): Thomas VANTROYS                                *
 * Contributor(s): Yvan PETER                                           *
 *                                                                      *
-* $Id: WfModel.java,v 1.2 2003/10/09 14:33:26 ypeter Exp $
+* $Id: WfModel.java,v 1.3 2005/03/11 09:04:22 moisev Exp $
 *=====================================================================*/
 package org.objectweb.cow.WorkflowModel;
 
@@ -36,8 +36,8 @@
    * @return the model key
    *
    * @ejb.interface-method
-  * @ejb.persistence column-name="_key"
-  * @ejb.pk-field
+   * @ejb.persistence column-name="_key"
+   * @ejb.pk-field
    * @jonas.cmp-field-jdbc-mapping field-name="key"
    *                               jdbc-field-name="_key"
   */
@@ -48,48 +48,48 @@
    *
    * @return the model key
    *
-  */
+   */
   public abstract void setKey(String key);
 
   /**
-       * Gets the model
-       *
-       * @return the model (in XML)
-       *
-       * @ejb.interface-method
+   * Gets the model
+   *
+   * @return the model (in XML)
+   *
+   * @ejb.interface-method
    * @ejb.persistence column-name="_model"
-       * @jonas.cmp-field-jdbc-mapping field-name="model"
-       *                               jdbc-field-name="_model"
+   * @jonas.cmp-field-jdbc-mapping field-name="model"
+   *                               jdbc-field-name="_model"
    */
   public abstract String getModel();
 
   /**
-       * Sets the model
-       *
-       * @param model the new model (in XML)
-       *
-       * @ejb.interface-method
+   * Sets the model
+   *
+   * @param model the new model (in XML)
+   *
+   * @ejb.interface-method
    */
   public abstract void setModel(String model);
 
   /**
-       * Gets the model ancestor
-       *
-       * @return the model ancestor. NULL if no ancestor
-       *
-       * @ejb.interface-method
+   * Gets the model ancestor
+   *
+   * @return the model ancestor. NULL if no ancestor
+   *
+   * @ejb.interface-method
    * @ejb.persistence column-name="_ancestor"
-       * @jonas.cmp-field-jdbc-mapping field-name="ancestor"
-       *                               jdbc-field-name="_ancestor"
+   * @jonas.cmp-field-jdbc-mapping field-name="ancestor"
+   *                               jdbc-field-name="_ancestor"
    */
   public abstract String getAncestor();
 
   /**
-       * Sets the model ancestor
-       *
-       * @param _ancestor the new model ancestor.
-       *
-       * @ejb.interface-method
+   * Sets the model ancestor
+   *
+   * @param _ancestor the new model ancestor.
+   *
+   * @ejb.interface-method
    */
   public abstract void setAncestor(String ancestor);
 }
Index: cow/ejb/src/org/objectweb/cow/WorkflowModel/WfProcessBean.java
diff -u cow/ejb/src/org/objectweb/cow/WorkflowModel/WfProcessBean.java:1.5 
cow/ejb/src/org/objectweb/cow/WorkflowModel/WfProcessBean.java:1.6
--- cow/ejb/src/org/objectweb/cow/WorkflowModel/WfProcessBean.java:1.5  Sun 
Oct 24 23:34:07 2004
+++ cow/ejb/src/org/objectweb/cow/WorkflowModel/WfProcessBean.java      Fri 
Mar 11 10:04:22 2005
@@ -20,7 +20,7 @@
 * Initial developer(s): Yvan PETER                                     *
 * Contributor(s): Thomas VANTROYS,  Nicolas VAURETTE                   *
 *                                                                      *
-* $Id: WfProcessBean.java,v 1.5 2004/10/24 21:34:07 moisev Exp $
+* $Id: WfProcessBean.java,v 1.6 2005/03/11 09:04:22 moisev Exp $
 *=====================================================================*/
 package org.objectweb.cow.WorkflowModel;
 
@@ -124,7 +124,7 @@
  *              view-type="local"
  * @ejb.ejb-ref ejb-name="WfProcessMgr"
  *              view-type="local"
- * ejb.ejb-ref ejb-name="WfProcessMgr"
+ * @ejb.ejb-ref ejb-name="WfProcessMgr"
  *              view-type="remote"
  * @ejb.ejb-ref ejb-name="WfRequester"
  *              view-type="local"
@@ -269,15 +269,13 @@
     setRequester(requester);
     set_manager(manager);
 
-    initModelManager();
+    initModelManager(false);
     setStart_deadline(modelManager2.getStartDeadLine());
     setMin_time(modelManager2.getMinTime());
     setMax_time(modelManager2.getMaxTime());
     setName(modelManager2.getProcessName());
     setDescription(modelManager2.getProcessDescription());
 
-    String idActivity = (String) requester.getPrimaryKey();
-    WfActivityLocal wfActivity = null;
 
     try
     {
@@ -296,6 +294,7 @@
 
       throw new EJBException();
     }
+
   }
 
   
//---------------------------------------------------------------------------
@@ -659,7 +658,7 @@
    *
    * @return The instance model
    *
-   * @ejb.interface-method view-type="local"
+   * @ejb.interface-method
    */
   public String getModelInstance()
   {
@@ -723,7 +722,11 @@
             else
             {
               // we create the new activity instance
-              WfActivityMgrLocal activityMgr = 
wfAMgrLocalHome.findByPrimaryKey(url);
+
+                       // Same problem to retrieve the WfActivityMgr.
+                       // See above
+//              WfActivityMgrLocal activityMgr = 
wfAMgrLocalHome.findByPrimaryKey(url);
+              WfActivityMgrLocal activityMgr = 
(WfActivityMgrLocal)(wfAMgrLocalHome.findByName(url)).iterator().next();
               WfActivityLocal activity2 = activityMgr.create_activity(p,
                   newActivity.getId(), getIdInstance());
               modelManager2.associateWfActivity(activity2.key(), activity2);
@@ -964,6 +967,7 @@
   {
     //  Get a WfActivityIterator from its Home
     WfActivityIterator wfAI = null;
+    query = "WfProcess = " + getIdWfProcess();
 
     try
     {
@@ -1002,6 +1006,7 @@
   {
     //  Get a WfActivityIterator from its Home
     WfActivityIterator wfAI = null;
+    query = "WfProcess = " + getIdWfProcess();
 
     try
     {
@@ -1178,7 +1183,12 @@
 
       try
       {
-        WfActivityMgrLocal activityMgr = 
wfAMgrLocalHome.findByPrimaryKey(url);
+                 // December 10 2004
+                 // We have to enhance the way to find an activityMgr.
+                 // Indeed, the WfActivityMgr are dynamically created 
+                 // when we add a new WfActivityModel and the WfPRocessModel 
knows only the name of the process, not its primary key
+//        WfActivityMgrLocal activityMgr = 
wfAMgrLocalHome.findByPrimaryKey(url);
+        WfActivityMgrLocal activityMgr = 
(WfActivityMgrLocal)(wfAMgrLocalHome.findByName(url)).iterator().next();
         WfActivityLocal activity = 
activityMgr.create_activity((WfProcessLocal) ctx.getEJBLocalObject(),
             id, getIdInstance());
 
@@ -1689,7 +1699,9 @@
   {
     if (modelManager2 == null)
     {
-      modelManager2 = new ModelManager2((WfProcessLocal) 
ctx.getEJBLocalObject());
+//      modelManager2 = new ModelManager2((WfProcessLocal) 
ctx.getEJBLocalObject());
+//      modelManager2 = new ModelManager2((WfProcessLocal) 
ctx.getEJBLocalObject(), get_manager());
+      modelManager2 = new ModelManager2((WfProcessLocal) 
ctx.getEJBLocalObject(), get_manager(), getModelInstance());
       modelManager2.init();
     }
     else
@@ -1701,6 +1713,25 @@
     }
   }
 
+  private synchronized void initModelManager(boolean flag)
+  {
+    if (modelManager2 == null)
+    {
+//      modelManager2 = new ModelManager2((WfProcessLocal) 
ctx.getEJBLocalObject());
+//      modelManager2 = new ModelManager2((WfProcessLocal) 
ctx.getEJBLocalObject(), get_manager());
+      modelManager2 = new ModelManager2((WfProcessLocal) 
ctx.getEJBLocalObject(), get_manager(), getModelInstance());
+      modelManager2.init(flag);
+    }
+    else
+    {
+      if (!modelManager2.isInitialised())
+      {
+        modelManager2.init();
+      }
+    }
+  }
+
+
 
   /**
    * Initializes the data flow manager
@@ -1766,7 +1797,7 @@
 
   public void ejbLoad()
   {
-    query = "WfProcess = " + getIdWfProcess();
+//    query = "WfProcess = " + getIdWfProcess();
   }
 
   public void ejbStore()
Index: cow/ejb/src/org/objectweb/cow/WorkflowModel/WfProcessMgrBean.java
diff -u cow/ejb/src/org/objectweb/cow/WorkflowModel/WfProcessMgrBean.java:1.3 
cow/ejb/src/org/objectweb/cow/WorkflowModel/WfProcessMgrBean.java:1.4
--- cow/ejb/src/org/objectweb/cow/WorkflowModel/WfProcessMgrBean.java:1.3     
  Tue Mar 30 18:21:31 2004
+++ cow/ejb/src/org/objectweb/cow/WorkflowModel/WfProcessMgrBean.java   Fri 
Mar 11 10:04:22 2005
@@ -20,7 +20,7 @@
 * Initial developer(s): Yvan PETER                                     *
 * Contributor(s): Thomas VANTROYS, Nicolas VAURETTE                    *
 *                                                                      *
-* $Id: WfProcessMgrBean.java,v 1.3 2004/03/30 16:21:31 moisev Exp $
+* $Id: WfProcessMgrBean.java,v 1.4 2005/03/11 09:04:22 moisev Exp $
 *=====================================================================*/
 package org.objectweb.cow.WorkflowModel;
 
@@ -150,28 +150,28 @@
       logger.log(BasicLevel.DEBUG, "ejbCreate");
     }
 
-    setIdWfProcessMgr(WfProcessMgrUtil.generateGUID(this));
-    setName(name);
-    setDescription(description);
-    setCategory(category);
-    setVersion(version);
-
-    
setProcess_mgr_state(org.omg.WorkflowModel.process_mgr_stateType.enabled.value());
-    context_signature = null;
-    result_signature = null;
-
     try
     {
       getBeanReferences();
     }
     catch (NamingException ex)
     {
-      logger.log(BasicLevel.ERROR, "NamingException");
+      logger.log(BasicLevel.ERROR, "ejbCreate: NamingException", ex);
 
       throw new CreateException();
     }
 
-    return null;
+    setIdWfProcessMgr(WfProcessMgrUtil.generateGUID(this));
+    setName(name);
+    setDescription(description);
+    setCategory(category);
+    setVersion(version);
+
+    
setProcess_mgr_state(org.omg.WorkflowModel.process_mgr_stateType.enabled.value());
+    context_signature = null;
+    result_signature = null;
+
+       return null;
   }
 
   public void ejbPostCreate(String name, String description, String category,
@@ -565,6 +565,8 @@
   
//---------------------------------------------------------------------------
 
   /**
+   * @ejb.interface-method viw-type="local"
+   * 
    * @ejb.relation name="WfProcess-to-WfProcessMgr"
    *               role-name="is-refered-by"
    *               target-ejb="WfProcess"
Index: cow/ejb/src/org/objectweb/cow/WorkflowModel/WfProcessModelBean.java
diff -u 
cow/ejb/src/org/objectweb/cow/WorkflowModel/WfProcessModelBean.java:1.1.1.1 
cow/ejb/src/org/objectweb/cow/WorkflowModel/WfProcessModelBean.java:1.2
--- 
cow/ejb/src/org/objectweb/cow/WorkflowModel/WfProcessModelBean.java:1.1.1.1 
Tue Sep 16 14:52:58 2003
+++ cow/ejb/src/org/objectweb/cow/WorkflowModel/WfProcessModelBean.java Fri 
Mar 11 10:04:22 2005
@@ -20,7 +20,7 @@
 * Initial developer(s): Thomas VANTROYS                                *
 * Contributor(s): Nicolas VAURETTE, Yvan PETER                         *
 *                                                                      *
-* $Id: WfProcessModelBean.java,v 1.1.1.1 2003/09/16 12:52:58 ypeter Exp $
+* $Id: WfProcessModelBean.java,v 1.2 2005/03/11 09:04:22 moisev Exp $
 *=====================================================================*/
 package org.objectweb.cow.WorkflowModel;
 
@@ -79,6 +79,9 @@
   
//---------------------------------------------------------------------------
 
   /**
+   *
+   * @throws javax.ejb.CreateException
+   *
    * @ejb.create-method
    */
   public String ejbCreate(String key, String model, String ancestor)
Index: cow/ejb/src/org/objectweb/cow/WorkflowModel/WfTaskBean.java
diff -u cow/ejb/src/org/objectweb/cow/WorkflowModel/WfTaskBean.java:1.3 
cow/ejb/src/org/objectweb/cow/WorkflowModel/WfTaskBean.java:1.4
--- cow/ejb/src/org/objectweb/cow/WorkflowModel/WfTaskBean.java:1.3     Tue 
Mar 30 18:21:31 2004
+++ cow/ejb/src/org/objectweb/cow/WorkflowModel/WfTaskBean.java Fri Mar 11 
10:04:22 2005
@@ -20,7 +20,7 @@
 * Initial developer(s): Thomas VANTROYS                                *
 * Contributor(s): Nicolas VAURETTE, Yvan PETER                         *
 *                                                                      *
-* $Id: WfTaskBean.java,v 1.3 2004/03/30 16:21:31 moisev Exp $
+* $Id: WfTaskBean.java,v 1.4 2005/03/11 09:04:22 moisev Exp $
 *=====================================================================*/
 package org.objectweb.cow.WorkflowModel;
 
@@ -311,8 +311,57 @@
    */
   public String[] valid_states() throws org.omg.WfBase.BaseException
   {
-    // NOT YET IMPLEMENTED
-    return null;
+       if (DEBUG_ON && logger.isLoggable(BasicLevel.DEBUG))
+    {
+      logger.log(BasicLevel.DEBUG, "valid_states");
+    }
+
+    // NOT YET FULLY IMPLEMENTED
+    String[] vs = null;
+
+    if (getState().equals("open.not_running.not_started"))
+    {
+      vs = new String[3];
+      vs[0] = "open.running";
+      vs[1] = "closed.aborted";
+      vs[2] = "open.not_running.waiting";
+    }
+    else if (getState().equals("open.not_running.suspended"))
+    {
+      vs = new String[3];
+      vs[0] = "open.running";
+      vs[1] = "closed.aborted";
+      vs[2] = "open.not_running.waiting";
+    }
+    else if (getState().equals("open.not_running.waiting"))
+    {
+      vs = new String[4];
+      vs[0] = "open.running";
+      vs[1] = "closed.completed";
+      vs[2] = "closed.terminates";
+      vs[3] = "closed.aborted";
+    }
+    else if (getState().equals("open.running"))
+    {
+      vs = new String[5];
+      vs[0] = "closed.completed";
+      vs[1] = "closed.terminated";
+      vs[2] = "closed.aborted";
+      vs[3] = "open.not_running.suspended";
+      vs[4] = "open.not_running.waiting";
+    }
+    else if (getState().startsWith("closed"))
+    {
+    }
+    else
+    {
+      throw new org.omg.WfBase.BaseException();
+    }
+
+    return vs;
+
+
+       
   }
 
   /**
@@ -345,7 +394,7 @@
   {
     // This should be changed in the future
     // The transformation would be placed in the facade WorkItemManager.
-    if (getState().equals("open.not_running.not_started"))
+/*    if (getState().equals("open.not_running.not_started"))
     {
       return "NOT STARTED";
     }
@@ -377,6 +426,8 @@
     {
       return "NO STATE";
     }
+       */
+         return getState();
   }
 
   /**
Index: cow/ejb/src/org/objectweb/cow/WorkflowModel/WfToolAgentBean.java
diff -u 
cow/ejb/src/org/objectweb/cow/WorkflowModel/WfToolAgentBean.java:1.1.1.1 
cow/ejb/src/org/objectweb/cow/WorkflowModel/WfToolAgentBean.java:1.2
--- cow/ejb/src/org/objectweb/cow/WorkflowModel/WfToolAgentBean.java:1.1.1.1  
  Tue Sep 16 14:52:57 2003
+++ cow/ejb/src/org/objectweb/cow/WorkflowModel/WfToolAgentBean.java    Fri 
Mar 11 10:04:22 2005
@@ -20,7 +20,7 @@
 * Initial developer(s): Thomas VANTROYS                                *
 * Contributor(s): Yvan PETER                                           *
 *                                                                      *
-* $Id: WfToolAgentBean.java,v 1.1.1.1 2003/09/16 12:52:57 ypeter Exp $
+* $Id: WfToolAgentBean.java,v 1.2 2005/03/11 09:04:22 moisev Exp $
 *=====================================================================*/
 package org.objectweb.cow.WorkflowModel;
 
@@ -171,6 +171,29 @@
 
       return url2;
     }
+       else if ( getToolAgentType().equals("WS") )
+       {
+               /*
+               DynamicInvoker di = new DynamicInvoker();
+               String wsdlLocation = 
"http://www.webservicex.com/globalweather.asmx?WSDL";;
+               String operationName = "GetWeather";
+               String inputName = null;
+               String outputName = null;
+               String portName = "GlobalWeatherSoap";
+               String protocol = "axis";
+               String args[] = null;
+               int shift = 3;
+               di.invokeMethod(
+                               wsdlLocation,
+                               operationName,
+                               inputName,
+                               outputName,
+                               portName,
+                               protocol,
+                               args,
+                       shift);
+               */
+       }
 
     /*        if ( this._toolAgentType.equals("WSDL") )
             {



<--  Date Index  --> <--  Thread Index  -->

Reply via email to:

Powered by MHonArc.

Copyright © 1999-2005, ObjectWeb Consortium | contact | webmaster.