[jbpm-commits] JBoss JBPM SVN: r3237 - projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec.

[do-not-reply at jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-12-05 12:53:02 -0500 (Fri, 05 Dec 2008)
New Revision: 3237

Modified:
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessEngineFactory.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/UserManagementImpl.java
Log:
Cleanup spec-api packages

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessEngineFactory.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessEngineFactory.java	2008-12-05 17:51:55 UTC (rev 3236)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessEngineFactory.java	2008-12-05 17:53:02 UTC (rev 3237)
@@ -21,8 +21,8 @@
  */
 package org.jboss.bpm.console.server.integration.spec;
 
-import org.jboss.bpm.api.client.Configuration;
-import org.jboss.bpm.api.client.ProcessEngine;
+import org.jboss.bpm.api.config.Configuration;
+import org.jboss.bpm.api.service.ProcessEngine;
 
 /**
  * @author Thomas.Diesler at jboss.com

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java	2008-12-05 17:51:55 UTC (rev 3236)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java	2008-12-05 17:53:02 UTC (rev 3237)
@@ -29,17 +29,17 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jboss.bpm.api.client.ProcessEngine;
 import org.jboss.bpm.api.model.Gateway;
 import org.jboss.bpm.api.model.Node;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
 import org.jboss.bpm.api.model.ProcessDefinition;
 import org.jboss.bpm.api.model.SequenceFlow;
 import org.jboss.bpm.api.model.SingleOutFlowSupport;
-import org.jboss.bpm.api.model.Process.ProcessStatus;
+import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
 import org.jboss.bpm.api.runtime.Token;
 import org.jboss.bpm.api.runtime.Token.TokenStatus;
 import org.jboss.bpm.api.service.ProcessDefinitionService;
+import org.jboss.bpm.api.service.ProcessEngine;
 import org.jboss.bpm.api.service.ProcessService;
 import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
 import org.jboss.bpm.console.client.model.ProcessInstanceRef;
@@ -106,7 +106,7 @@
     if (procDef == null)
       throw new IllegalStateException("Cannot obtain process definition: " + procDefId);
 
-    Process proc = procDef.newInstance();
+    ProcessInstance proc = procDef.newInstance();
     proc.startProcess();
 
     log.info("Started: " + proc);
@@ -129,7 +129,7 @@
     while (itProc.hasNext())
     {
       ObjectName procID = itProc.next();
-      Process proc = procService.getProcess(procID);
+      ProcessInstance proc = procService.getProcess(procID);
 
       log.info(proc);
 
@@ -141,7 +141,7 @@
 
   public ProcessInstanceRef getProcessInstance(long procID)
   {
-    Process proc = getProcessById(procID);
+    ProcessInstance proc = getProcessById(procID);
     log.info("getProcessInstance: " + proc);
 
     ProcessInstanceRef procRef = adaptProcess(proc);
@@ -150,7 +150,7 @@
 
   public void setProcessState(long procID, STATE nextState)
   {
-    Process proc = getProcessById(procID);
+    ProcessInstance proc = getProcessById(procID);
     log.info("setProcessState " + nextState + " on: " + proc);
 
     ProcessInstanceRef procRef = adaptProcess(proc);
@@ -178,7 +178,7 @@
     while (token == null && itProc.hasNext())
     {
       ObjectName procID = itProc.next();
-      Process proc = procService.getProcess(procID);
+      ProcessInstance proc = procService.getProcess(procID);
       for (Token aux : proc.getTokens())
       {
         Long auxId = adaptKey(aux.getKey());
@@ -239,9 +239,9 @@
     return pService;
   }
 
-  private Process getProcessById(long procID)
+  private ProcessInstance getProcessById(long procID)
   {
-    Process proc = null;
+    ProcessInstance proc = null;
     ProcessService procService = getProcessService();
     Iterator<ObjectName> it = procService.getProcesses().iterator();
     while (it.hasNext())
@@ -256,7 +256,7 @@
     return proc;
   }
 
-  private ProcessInstanceRef adaptProcess(Process proc)
+  private ProcessInstanceRef adaptProcess(ProcessInstance proc)
   {
     Long procDefID = adaptKey(proc.getProcessDefinition().getKey());
     Long procID = adaptKey(proc.getKey());

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java	2008-12-05 17:51:55 UTC (rev 3236)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java	2008-12-05 17:53:02 UTC (rev 3237)
@@ -28,14 +28,14 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jboss.bpm.api.client.ProcessEngine;
 import org.jboss.bpm.api.model.Node;
-import org.jboss.bpm.api.model.Process;
+import org.jboss.bpm.api.model.ProcessInstance;
 import org.jboss.bpm.api.model.ProcessDefinition;
 import org.jboss.bpm.api.model.SingleOutFlowSupport;
 import org.jboss.bpm.api.model.builder.ObjectNameFactory;
 import org.jboss.bpm.api.runtime.Token;
 import org.jboss.bpm.api.service.ExecutionService;
+import org.jboss.bpm.api.service.ProcessEngine;
 import org.jboss.bpm.api.service.TaskService;
 import org.jboss.bpm.api.task.Task;
 import org.jboss.bpm.console.client.model.TaskRef;
@@ -104,7 +104,7 @@
     Token token = getExecutionService().getToken(tokenKey);
     Long tokenId = adaptKey(tokenKey);
     
-    Process proc = token.getProcess();
+    ProcessInstance proc = token.getProcess();
     Long procId = adaptKey(proc.getKey());
     
     ProcessDefinition procDef = proc.getProcessDefinition();

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/UserManagementImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/UserManagementImpl.java	2008-12-05 17:51:55 UTC (rev 3236)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/UserManagementImpl.java	2008-12-05 17:53:02 UTC (rev 3237)
@@ -25,8 +25,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jboss.bpm.api.client.ProcessEngine;
 import org.jboss.bpm.api.service.IdentityService;
+import org.jboss.bpm.api.service.ProcessEngine;
 import org.jboss.bpm.console.server.integration.UserManagement;
 
 /**