[jbpm-commits] JBoss JBPM SVN: r3022 - in projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server: integration and 1 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Nov 21 05:53:39 EST 2008


Author: heiko.braun at jboss.com
Date: 2008-11-21 05:53:39 -0500 (Fri, 21 Nov 2008)
New Revision: 3022

Modified:
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/JBPM3MgmtFacade.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/JBPM3Extension.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/TaskManagement.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/UserManagement.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ManagementExtension.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ProcessManagement.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/Transform.java
Log:
Cleanup API

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/JBPM3MgmtFacade.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/JBPM3MgmtFacade.java	2008-11-21 10:41:15 UTC (rev 3021)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/JBPM3MgmtFacade.java	2008-11-21 10:53:39 UTC (rev 3022)
@@ -180,7 +180,7 @@
    {
       log.debug("Signal token " + id + " -> " + signalName);
 
-      getManagementExtension().signalToken(id, signalName);
+      getProcessManagement().signalToken(id, signalName);
       return Response.ok().type("application/json").build();
    }
 
@@ -193,7 +193,7 @@
    {
       log.debug("Signal token " + id);
 
-      getManagementExtension().signalToken(id, null);
+      getProcessManagement().signalToken(id, null);
       return Response.ok().type("application/json").build();
    }
 

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java	2008-11-21 10:41:15 UTC (rev 3021)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java	2008-11-21 10:53:39 UTC (rev 3022)
@@ -105,7 +105,7 @@
    {
 
       ProcessInstanceRefWrapper wrapper =
-            new ProcessInstanceRefWrapper(getProcessDAO().getInstancesByProcessId(processId));
+            new ProcessInstanceRefWrapper(getProcessDAO().getInstancesByDefinitionId(processId));
       return createJsonResponse(wrapper);
    }
 
@@ -131,7 +131,9 @@
          String next)
    {
       log.debug("Change instance (ID "+instanceId+") to state " +next);
-      getManagementExtension().changeState(instanceId, next);
+
+      ProcessInstanceRef.STATE state = ProcessInstanceRef.STATE.valueOf(next);
+      getManagementExtension().changeInstanceState(instanceId, state);
       return Response.ok().type("application/json").build();
    }
 

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/JBPM3Extension.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/JBPM3Extension.java	2008-11-21 10:41:15 UTC (rev 3021)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/JBPM3Extension.java	2008-11-21 10:53:39 UTC (rev 3022)
@@ -24,6 +24,7 @@
 import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo;
 import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
 import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
+import org.jboss.bpm.console.client.model.ProcessInstanceRef;
 
 import java.util.Map;
 
@@ -40,14 +41,11 @@
 
    ActiveNodeInfo getActivNodeInfo(long instanceId);
 
-   // TODO: move to process management
-   void signalToken(long tokenId, String signal);
-
    Map<String, String> getAvailableTaskForms(long processId);
 
    byte[] getTaskFormByTaskName(long processId, long taskId);
 
-   void changeState(long instanceId, String nextState);
+   void changeInstanceState(long instanceId, ProcessInstanceRef.STATE nextState);
 
    ProcessDefinitionRef deployNewDefinition(byte[] data);
 }

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java	2008-11-21 10:41:15 UTC (rev 3021)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java	2008-11-21 10:53:39 UTC (rev 3022)
@@ -27,8 +27,6 @@
 import java.util.List;
 
 /**
- * Access process related data.
- * 
  * @author Heiko.Braun <heiko.braun at jboss.com>
  */
 public interface ProcessManagement
@@ -39,10 +37,11 @@
 
    List<ProcessDefinitionRef> removeDefinition(long processId);
 
-   List<ProcessInstanceRef> getInstancesByProcessId(long processId);
+   List<ProcessInstanceRef> getInstancesByDefinitionId(long processId);
 
    ProcessInstanceRef getInstanceById(long instanceId);
 
    ProcessInstanceRef newInstance(long processId);
 
+   void signalToken(long tokenId, String signal);
 }

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/TaskManagement.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/TaskManagement.java	2008-11-21 10:41:15 UTC (rev 3021)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/TaskManagement.java	2008-11-21 10:53:39 UTC (rev 3022)
@@ -31,9 +31,10 @@
 public interface TaskManagement
 {
    List<TaskRef> getTasksByActor(String actorName);
+
    TaskRef getTaskById(long taskId);
+
    void reassignTask(long taskId, String actorId);
-
-   // TODO: If signaling resides with an extension then closeTask() should as well
+   
    void closeTask(long taskId, String signalName);
 }

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/UserManagement.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/UserManagement.java	2008-11-21 10:41:15 UTC (rev 3021)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/UserManagement.java	2008-11-21 10:53:39 UTC (rev 3022)
@@ -29,5 +29,6 @@
 public interface UserManagement
 {
    List<String> getGroupsForActor(String actorId);
+   
    List<String> getActorsForGroup(String groupName);
 }

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ManagementExtension.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ManagementExtension.java	2008-11-21 10:41:15 UTC (rev 3021)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ManagementExtension.java	2008-11-21 10:53:39 UTC (rev 3022)
@@ -24,6 +24,7 @@
 import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo;
 import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
 import org.jboss.bpm.console.client.model.jbpm3.DiagramNodeInfo;
+import org.jboss.bpm.console.client.model.ProcessInstanceRef;
 import org.jboss.bpm.console.server.integration.JBPM3Extension;
 import org.jbpm.graph.def.ProcessDefinition;
 import org.jbpm.file.def.FileDefinition;
@@ -90,12 +91,6 @@
       return new ActiveNodeInfo(diagram.getWidth(), diagram.getHeight(), activeNode);
    }
 
-
-   public void signalToken(long tokenId, String signal)
-   {
-      delegate.signalToken(tokenId, signal);
-   }
-
    public Map<String, String> getAvailableTaskForms(long processId)
    {
       org.jbpm.graph.def.ProcessDefinition processDefinition =
@@ -154,7 +149,7 @@
 
    }
 
-   public void changeState(long instanceId, String nextState)
+   public void changeInstanceState(long instanceId, ProcessInstanceRef.STATE nextState)
    {
       org.jbpm.graph.exe.ProcessInstance p0 = delegate.getActualInstance(instanceId);
       Transform.doTransition(p0, nextState);  // modifies the actual PI

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ProcessManagement.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ProcessManagement.java	2008-11-21 10:41:15 UTC (rev 3021)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ProcessManagement.java	2008-11-21 10:53:39 UTC (rev 3022)
@@ -71,7 +71,7 @@
       return Transform.processInstance(instance);  
    }
 
-   public List<ProcessInstanceRef> getInstancesByProcessId(long processId)
+   public List<ProcessInstanceRef> getInstancesByDefinitionId(long processId)
    {
       List<org.jbpm.graph.exe.ProcessInstance> instances = delegate.getActualInstances(processId);
       List<ProcessInstanceRef> results = new ArrayList<ProcessInstanceRef>(instances.size());
@@ -88,4 +88,9 @@
       return Transform.processInstance(instance);
    }
 
+   public void signalToken(long tokenId, String signal)
+   {
+      delegate.signalToken(tokenId, signal);
+   }
+
 }

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/Transform.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/Transform.java	2008-11-21 10:41:15 UTC (rev 3021)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/Transform.java	2008-11-21 10:53:39 UTC (rev 3022)
@@ -86,7 +86,7 @@
       return token;
    }
 
-   public static void doTransition(org.jbpm.graph.exe.ProcessInstance p0, String nextState)
+   public static void doTransition(org.jbpm.graph.exe.ProcessInstance p0, ProcessInstanceRef.STATE nextState)
    {
       ProcessInstanceRef instance = Transform.processInstance(p0);
       instance.setState(nextState);  // has lifecycle build in, hence the extra round




More information about the jbpm-commits mailing list