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

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Dec 5 15:41:51 EST 2008


Author: thomas.diesler at jboss.com
Date: 2008-12-05 15:41:51 -0500 (Fri, 05 Dec 2008)
New Revision: 3241

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/integration/jbpm3/JBPM3CommandDelegate.java
Log:
if (default transition) signalName = null

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-12-05 20:36:22 UTC (rev 3240)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/JBPM3MgmtFacade.java	2008-12-05 20:41:51 UTC (rev 3241)
@@ -188,6 +188,9 @@
    {
       log.debug("Signal token " + id + " -> " + signalName);
 
+      if ("default transition".equals(signalName))
+        signalName = null;
+      
       getProcessManagement().signalToken(id, signalName);
       return Response.ok().type("application/json").build();
    }

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/JBPM3CommandDelegate.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/JBPM3CommandDelegate.java	2008-12-05 20:36:22 UTC (rev 3240)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/JBPM3CommandDelegate.java	2008-12-05 20:41:51 UTC (rev 3241)
@@ -53,189 +53,176 @@
  */
 class JBPM3CommandDelegate
 {
-   private LocalCommandService facade;
-   private static final String DEFAULT_JNDI_NAME = "java:ejb/CommandServiceBean";
+  private LocalCommandService facade;
+  private static final String DEFAULT_JNDI_NAME = "java:ejb/CommandServiceBean";
 
-   /**
-    * Lookup with particluar JNDI name.
-    * @param jndiName
-    */
-   public JBPM3CommandDelegate(String jndiName)
-   {
-      ejbLookup(jndiName);
-   }
+  /*
+   * Lookup with particluar JNDI name.
+   * @param jndiName
+   */
+  public JBPM3CommandDelegate(String jndiName)
+  {
+    ejbLookup(jndiName);
+  }
 
-   /**
-    * Lookup using default JNDI name.
-    *
-    * @see #DEFAULT_JNDI_NAME
-    */
+  /*
+   * Lookup using default JNDI name.
+   * @see #DEFAULT_JNDI_NAME
+   */
 
-   public JBPM3CommandDelegate()
-   {
-      ejbLookup(DEFAULT_JNDI_NAME);
-   }
+  public JBPM3CommandDelegate()
+  {
+    ejbLookup(DEFAULT_JNDI_NAME);
+  }
 
-   private void ejbLookup(String jndiName)
-   {
-      try
-      {
-         LocalCommandServiceHome home = (LocalCommandServiceHome)
-           ServiceLocator.getEjbLocalHome(jndiName);
-         this.facade = home.create();
-      }
-      catch (CreateException e)
-      {
-         throw new RuntimeException("Failed to create LocalCommandService", e);
-      }
-   }
+  private void ejbLookup(String jndiName)
+  {
+    try
+    {
+      LocalCommandServiceHome home = (LocalCommandServiceHome)ServiceLocator.getEjbLocalHome(jndiName);
+      this.facade = home.create();
+    }
+    catch (CreateException e)
+    {
+      throw new RuntimeException("Failed to create LocalCommandService", e);
+    }
+  }
 
-   public List<ProcessDefinition> getActualDefinitions()
-   {
-      List<ProcessDefinition> defs = (List<ProcessDefinition>)
-        facade.execute( new GetProcessDefinitionsCommand(false) );
-      return defs;
-   }
+  public List<ProcessDefinition> getActualDefinitions()
+  {
+    List<ProcessDefinition> defs = (List<ProcessDefinition>)facade.execute(new GetProcessDefinitionsCommand(false));
+    return defs;
+  }
 
-   public ProcessDefinition getActualDefinition(String name)
-   {
-      ProcessDefinition def = (ProcessDefinition)
-        facade.execute( new GetProcessDefinitionCommand(name) );
-      return def;
-   }
+  public ProcessDefinition getActualDefinition(String name)
+  {
+    ProcessDefinition def = (ProcessDefinition)facade.execute(new GetProcessDefinitionCommand(name));
+    return def;
+  }
 
-   public ProcessDefinition getActualDefinition(long processId)
-   {
-      List<ProcessDefinition> defs = getActualDefinitions();
+  public ProcessDefinition getActualDefinition(long processId)
+  {
+    List<ProcessDefinition> defs = getActualDefinitions();
 
-      ProcessDefinition match = null;
-      for(ProcessDefinition p0 : defs)
+    ProcessDefinition match = null;
+    for (ProcessDefinition p0 : defs)
+    {
+      if (processId == p0.getId())
       {
-         if(processId == p0.getId())
-         {
-            match = p0;
-            break;
-         }
+        match = p0;
+        break;
       }
+    }
 
-      if(null==match)
-         throw new IllegalArgumentException("No process definition with ID " + processId);
+    if (null == match)
+      throw new IllegalArgumentException("No process definition with ID " + processId);
 
-      return match;
-   }
+    return match;
+  }
 
-   public void removeActualDefinition(long processId)
-   {
-      ProcessDefinition def = getActualDefinition(processId);
-      facade.execute( new DeleteProcessDefinitionCommand(processId));
-   }
+  public void removeActualDefinition(long processId)
+  {
+    ProcessDefinition def = getActualDefinition(processId);
+    facade.execute(new DeleteProcessDefinitionCommand(processId));
+  }
 
-   public org.jbpm.graph.exe.ProcessInstance getActualInstance(long instanceId)
-   {
-      ProcessInstance instance = (ProcessInstance)
-        facade.execute( new GetProcessInstanceCommand(instanceId));
-      return instance;
-   }
+  public org.jbpm.graph.exe.ProcessInstance getActualInstance(long instanceId)
+  {
+    ProcessInstance instance = (ProcessInstance)facade.execute(new GetProcessInstanceCommand(instanceId));
+    return instance;
+  }
 
-   public List<ProcessInstance> getActualInstances(long processId)
-   {
-      ProcessDefinition p0 = getActualDefinition(processId);
-      GetProcessInstancesCommand command = new GetProcessInstancesCommand();
-      command.setProcessId(processId);
+  public List<ProcessInstance> getActualInstances(long processId)
+  {
+    ProcessDefinition p0 = getActualDefinition(processId);
+    GetProcessInstancesCommand command = new GetProcessInstancesCommand();
+    command.setProcessId(processId);
 
-      List<ProcessInstance> instances =
-        (List<ProcessInstance>) facade.execute(command);
+    List<ProcessInstance> instances = (List<ProcessInstance>)facade.execute(command);
 
-      return instances;
-   }
+    return instances;
+  }
 
-   public ProcessInstance startNewInstance(long processId)
-   {      
-      NewProcessInstanceCommand command = new NewProcessInstanceCommand();
-      command.setProcessId(processId);
-      ProcessInstance instance = (ProcessInstance)facade.execute(command);
-      return instance;
-   }
+  public ProcessInstance startNewInstance(long processId)
+  {
+    NewProcessInstanceCommand command = new NewProcessInstanceCommand();
+    command.setProcessId(processId);
+    ProcessInstance instance = (ProcessInstance)facade.execute(command);
+    return instance;
+  }
 
-   public ProcessDefinition deploy(byte[] data)
-   {
-      ProcessDefinition p0 = (ProcessDefinition)
-        facade.execute(
-         new DeployProcessCommand(data)
-      );
-      return p0;  
-   }
+  public ProcessDefinition deploy(byte[] data)
+  {
+    ProcessDefinition p0 = (ProcessDefinition)facade.execute(new DeployProcessCommand(data));
+    return p0;
+  }
 
-   public List<TaskInstance> getActualTasksForActor(String actorName)
-   {
+  public List<TaskInstance> getActualTasksForActor(String actorName)
+  {
 
-      List<String> groupNames = getGroupsForActor(actorName);
+    List<String> groupNames = getGroupsForActor(actorName);
 
-      String[] actors = new String[groupNames.size()+1];
-      int i=0;
-      for(String s : groupNames)
-      {
-         actors[i] = s;
-         i++;
-      }
+    String[] actors = new String[groupNames.size() + 1];
+    int i = 0;
+    for (String s : groupNames)
+    {
+      actors[i] = s;
+      i++;
+    }
 
-      actors[i] = actorName;  // all groups & the username
+    actors[i] = actorName; // all groups & the username
 
-      List<TaskInstance> tasks = new ArrayList<TaskInstance>();
-      GetTaskListCommand command = new GetTaskListCommand(actors);
-      tasks.addAll( (List<TaskInstance>) facade.execute(command));
-      return tasks;
-   }
+    List<TaskInstance> tasks = new ArrayList<TaskInstance>();
+    GetTaskListCommand command = new GetTaskListCommand(actors);
+    tasks.addAll((List<TaskInstance>)facade.execute(command));
+    return tasks;
+  }
 
-   public List<String> getGroupsForActor(String actorName)
-   {
-      List<String> groupNames = (List<String>)facade.execute(
-        new GetGroupMembershipCommand(actorName)
-      );
-      return groupNames;
-   }
+  public List<String> getGroupsForActor(String actorName)
+  {
+    List<String> groupNames = (List<String>)facade.execute(new GetGroupMembershipCommand(actorName));
+    return groupNames;
+  }
 
-   public List<String> getActorsForGroup(String groupName)
-   {
-      List<String> actorIds = (List<String>)facade.execute(
-            new GetUsersForGroupCommand(groupName)
-      );
-      return actorIds;
-   }
+  public List<String> getActorsForGroup(String groupName)
+  {
+    List<String> actorIds = (List<String>)facade.execute(new GetUsersForGroupCommand(groupName));
+    return actorIds;
+  }
 
-   public TaskInstance getTaskById(long taskId)
-   {
-      // include variables, but no logs
-      return (TaskInstance) facade.execute( new GetTaskInstanceCommand(taskId, true, false));
-   }
+  public TaskInstance getTaskById(long taskId)
+  {
+    // include variables, but no logs
+    return (TaskInstance)facade.execute(new GetTaskInstanceCommand(taskId, true, false));
+  }
 
-   public void assignTask(long taskId, String actorId)
-   {
-      if(actorId!=null)
-      {
-         StartWorkOnTaskCommand command = new StartWorkOnTaskCommand(taskId, true);
-         command.setActorId(actorId);
-         facade.execute(command);
-      }
-      else
-      {
-         CancelWorkOnTaskCommand command = new CancelWorkOnTaskCommand(taskId);         
-         facade.execute(command);
-      }
-   }
-
-   public void signalToken(long tokenId, String signalName)
-   {
-      SignalCommand command = new SignalCommand(tokenId, signalName);
+  public void assignTask(long taskId, String actorId)
+  {
+    if (actorId != null)
+    {
+      StartWorkOnTaskCommand command = new StartWorkOnTaskCommand(taskId, true);
+      command.setActorId(actorId);
       facade.execute(command);
-   }
+    }
+    else
+    {
+      CancelWorkOnTaskCommand command = new CancelWorkOnTaskCommand(taskId);
+      facade.execute(command);
+    }
+  }
 
-   public void endTask(long taskId, String signalName)
-   {
-      TaskInstanceEndCommand command = new TaskInstanceEndCommand();
-      command.setTaskInstanceId(taskId);
-      command.setTransitionName(signalName);
+  public void signalToken(long tokenId, String signalName)
+  {
+    SignalCommand command = new SignalCommand(tokenId, signalName);
+    facade.execute(command);
+  }
 
-      facade.execute(command);
-   }
+  public void endTask(long taskId, String signalName)
+  {
+    TaskInstanceEndCommand command = new TaskInstanceEndCommand();
+    command.setTaskInstanceId(taskId);
+    command.setTransitionName(signalName);
+
+    facade.execute(command);
+  }
 }




More information about the jbpm-commits mailing list