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

Author: heiko.braun(a)jboss.com Date: 2008-11-25 11:45:39 -0500 (Tue, 25 Nov 2008) New Revision: 3084 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/integration/spec/ProcessManagementImpl.java Log: Rollback to -r3080 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-25 16:11:56 UTC (rev 3083) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2008-11-25 16:45:39 UTC (rev 3084) @@ -21,24 +21,20 @@ */ package org.jboss.bpm.console.server; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; - +import com.google.gson.Gson; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.bpm.console.client.model.ProcessDefinitionRefWrapper; import org.jboss.bpm.console.client.model.ProcessInstanceRef; import org.jboss.bpm.console.client.model.ProcessInstanceRefWrapper; +import org.jboss.bpm.console.client.model.ProcessDefinitionRef; import org.jboss.bpm.console.server.gson.GsonFactory; import org.jboss.bpm.console.server.integration.JBPM3Extension; import org.jboss.bpm.console.server.integration.ManagementFactory; import org.jboss.bpm.console.server.integration.ProcessManagement; -import com.google.gson.Gson; +import javax.ws.rs.*; +import javax.ws.rs.core.Response; /** * REST server module for accessing process related data. 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-11-25 16:11:56 UTC (rev 3083) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java 2008-11-25 16:45:39 UTC (rev 3084) @@ -21,23 +21,11 @@ */ package org.jboss.bpm.console.server.integration.spec; -import java.util.ArrayList; -import java.util.Iterator; import java.util.List; -import javax.management.ObjectName; - import org.jboss.bpm.console.client.model.ProcessDefinitionRef; import org.jboss.bpm.console.client.model.ProcessInstanceRef; import org.jboss.bpm.console.server.integration.ProcessManagement; -import org.jbpm.api.NotImplementedException; -import org.jbpm.api.client.Configuration; -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.Process.ProcessStatus; -import org.jbpm.api.service.ProcessDefinitionService; -import org.jbpm.api.service.ProcessService; /** * An implementation that delegates to the jBPM API @@ -49,147 +37,36 @@ { public List<ProcessDefinitionRef> getAllDefinitions() { - List<ProcessDefinitionRef> results = new ArrayList<ProcessDefinitionRef>(); - - ProcessDefinitionService pdService = getProcessDefinitionService(); - Iterator<ObjectName> itKey = pdService.getProcessDefinitions().iterator(); - while(itKey.hasNext()) - { - ObjectName procDefKey = itKey.next(); - ProcessDefinition procDef = pdService.getProcessDefinition(procDefKey); - ProcessDefinitionRef pdRef = adaptProcessDefinition(procDef); - results.add(pdRef); - } - - return results; + throw new RuntimeException("Not implemented"); } - public ProcessDefinitionRef getDefinitionById(long procDefId) + public ProcessDefinitionRef getDefinitionById(long processId) { - ProcessDefinitionRef results = null; - - ProcessDefinition procDef = getProcessDefinitionById(procDefId); - if (procDef != null) - { - results = new ProcessDefinitionRef(procDefId, procDef.getName(), procDef.getVersion()); - } - - return results; + throw new RuntimeException("Not implemented"); } - public List<ProcessDefinitionRef> removeDefinition(long procDefId) + public List<ProcessDefinitionRef> removeDefinition(long processId) { - ProcessDefinition procDef = getProcessDefinitionById(procDefId); - if (procDef != null) - { - ProcessDefinitionService pdService = getProcessDefinitionService(); - pdService.unregisterProcessDefinition(procDef.getKey()); - } - return getAllDefinitions(); + throw new RuntimeException("Not implemented"); } - public ProcessInstanceRef newInstance(long procDefId) + public ProcessInstanceRef newInstance(long processId) { - ProcessDefinition procDef = getProcessDefinitionById(procDefId); - if (procDef == null) - throw new IllegalStateException("Cannot obtain process definition: " + procDefId); - - Process proc = procDef.newInstance(); - ProcessInstanceRef procRef = adaptProcess(proc); - return procRef; + throw new RuntimeException("Not implemented"); } - public List<ProcessInstanceRef> getInstancesByDefinitionId(long procDefId) + public List<ProcessInstanceRef> getInstancesByDefinitionId(long processId) { - throw new NotImplementedException(); + throw new RuntimeException("Not implemented"); } - public ProcessInstanceRef getInstanceById(long procID) + public ProcessInstanceRef getInstanceById(long instanceId) { - Process proc = getProcessById(procID); - ProcessInstanceRef procRef = adaptProcess(proc); - return procRef; + throw new RuntimeException("Not implemented"); } public void signalToken(long tokenId, String signal) { - throw new NotImplementedException(); + throw new RuntimeException("Not implemented"); } - - private ProcessDefinitionService getProcessDefinitionService() - { - ProcessEngine engine = Configuration.getProcessEngine(); - ProcessDefinitionService pdService = engine.getService(ProcessDefinitionService.class); - return pdService; - } - - private ProcessDefinition getProcessDefinitionById(long procDefID) - { - ProcessDefinition procDef = null; - ProcessDefinitionService pdService = getProcessDefinitionService(); - Iterator<ObjectName> it = pdService.getProcessDefinitions().iterator(); - while(it.hasNext()) - { - ObjectName auxKey = it.next(); - if (procDefID == apaptKey(auxKey)) - { - procDef = pdService.getProcessDefinition(auxKey); - break; - } - } - return procDef; - } - - private ProcessDefinitionRef adaptProcessDefinition(ProcessDefinition procDef) - { - ObjectName procDefKey = procDef.getKey(); - Long procDefID = apaptKey(procDefKey); - return new ProcessDefinitionRef(procDefID, procDef.getName(), procDef.getVersion()); - } - - private ProcessService getProcessService() - { - ProcessEngine engine = Configuration.getProcessEngine(); - ProcessService pService = engine.getService(ProcessService.class); - return pService; - } - - private Process getProcessById(long procID) - { - Process proc = null; - ProcessService pdService = getProcessService(); - Iterator<ObjectName> it = pdService.getProcesses().iterator(); - while(it.hasNext()) - { - ObjectName auxKey = it.next(); - if (procID == apaptKey(auxKey)) - { - proc = pdService.getProcess(auxKey); - break; - } - } - return proc; - } - - private ProcessInstanceRef adaptProcess(Process proc) - { - Long procDefID = apaptKey(proc.getProcessDefinition().getKey()); - Long procID = apaptKey(proc.getKey()); - - // [TODO] clarify process status - ProcessStatus status = proc.getProcessStatus(); - boolean suspended = ProcessStatus.Active != status; - - ProcessInstanceRef procRef = new ProcessInstanceRef(procID, procDefID, proc.getStartDate(), proc.getEndDate(), suspended); - return procRef; - } - - private Long apaptKey(ObjectName procDefKey) - { - String procDefID = procDefKey.getKeyProperty("id"); - if (procDefID == null) - throw new IllegalStateException("Cannot obtain id property from: " + procDefKey); - - return new Long(procDefID); - } }