[jbpm-commits] JBoss JBPM SVN: r5102 - in jbpm4/trunk/modules/integration/console: src/main/java/org/jbpm/integration/console and 1 other directory.

Author: heiko.braun(a)jboss.com Date: 2009-06-24 08:37:51 -0400 (Wed, 24 Jun 2009) New Revision: 5102 Modified: jbpm4/trunk/modules/integration/console/integration-console.iml jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/DeploymentPluginImpl.java jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java Log: select suspended deployments Modified: jbpm4/trunk/modules/integration/console/integration-console.iml =================================================================== --- jbpm4/trunk/modules/integration/console/integration-console.iml 2009-06-24 06:53:24 UTC (rev 5101) +++ jbpm4/trunk/modules/integration/console/integration-console.iml 2009-06-24 12:37:51 UTC (rev 5102) @@ -9,6 +9,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="gwt-rpc" /> <orderEntry type="module" module-name="gwt-parent" exported="" /> <orderEntry type="module" module-name="server-integration" exported="" /> <orderEntry type="module" module-name="test-base" exported="" /> Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/DeploymentPluginImpl.java =================================================================== --- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/DeploymentPluginImpl.java 2009-06-24 06:53:24 UTC (rev 5101) +++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/DeploymentPluginImpl.java 2009-06-24 12:37:51 UTC (rev 5102) @@ -21,17 +21,15 @@ */ package org.jbpm.integration.console; -import java.util.ArrayList; -import java.util.List; - import org.jboss.bpm.console.client.model.DeploymentRef; import org.jboss.bpm.console.server.plugin.DeploymentPlugin; -import org.jbpm.api.Deployment; -import org.jbpm.api.DeploymentQuery; -import org.jbpm.api.RepositoryService; +import org.jbpm.api.*; +import org.jbpm.pvm.internal.env.EnvironmentFactory; import org.jbpm.pvm.internal.env.Environment; -import org.jbpm.pvm.internal.env.EnvironmentFactory; +import java.util.ArrayList; +import java.util.List; + /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; */ @@ -52,14 +50,39 @@ try { - RepositoryService repositoryService = this.processEngine.getRepositoryService(); DeploymentQuery dquery = repositoryService.createDeploymentQuery(); + List<Deployment> dpls = dquery.list(); for(Deployment dpl : dpls) { - results.add( ModelAdaptor.adoptDeployment(dpl) ); + DeploymentRef ref = ModelAdaptor.adoptDeployment(dpl); + + // active processes + ProcessDefinitionQuery pdQuery = repositoryService.createProcessDefinitionQuery(); + pdQuery.deploymentDbid(dpl.getDbid()); + List<ProcessDefinition> activePds = pdQuery.list(); + + for(ProcessDefinition p : activePds) + { + ref.getDefinitions().add(p.getId()); + } + + // suspended processes + /* TODO: Uncomment when JBPM-2355 is done + ProcessDefinitionQuery pdQuery2 = repositoryService.createProcessDefinitionQuery(); + pdQuery2.deploymentDbid(dpl.getDbid()); + pdQuery2.suspended(); + List<ProcessDefinition> suspendedPds = pdQuery2.list(); + + for(ProcessDefinition p : suspendedPds) + { + ref.getDefinitions().add(p.getId()); + } + + */ + results.add(ref); } return results; @@ -68,17 +91,40 @@ { env.close(); } - - } public void deleteDeployment(String id) { + Environment env = ((EnvironmentFactory)processEngine).openEnvironment(); + try + { + RepositoryService repositoryService = this.processEngine.getRepositoryService(); + repositoryService.deleteDeploymentCascade(Long.valueOf(id)); + } + finally + { + env.close(); + } + } public void setSuspended(String id, boolean isSuspended) { + Environment env = ((EnvironmentFactory)processEngine).openEnvironment(); + try + { + RepositoryService repositoryService = this.processEngine.getRepositoryService(); + if(isSuspended) + repositoryService.suspendDeployment(Long.valueOf(id)); + else + repositoryService.resumeDeployment(Long.valueOf(id)); + } + finally + { + env.close(); + } + } } Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java =================================================================== --- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-06-24 06:53:24 UTC (rev 5101) +++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-06-24 12:37:51 UTC (rev 5102) @@ -28,6 +28,7 @@ import org.jbpm.api.task.Participation; import org.jbpm.api.task.Task; import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; import org.jbpm.pvm.internal.repository.DeploymentImpl; import org.jbpm.pvm.internal.task.TaskImpl; @@ -48,9 +49,14 @@ def.setName(processDefinition.getName()); def.setVersion(processDefinition.getVersion()); def.setKey( processDefinition.getKey() ); - // def.setDescription(p0.getDescription()); - // def.setPackageName(p0.getPackageName()); + // TODO: why is that not part of the API and requires cast? + ProcessDefinitionImpl cast = (ProcessDefinitionImpl)processDefinition; + + //def.setDescription(processDefinition.getDescription()); + def.setPackageName(cast.getPackageName()); + def.setDeploymentId(String.valueOf(cast.getDeploymentDbid())); + return def; } @@ -169,6 +175,17 @@ String.valueOf(dpl.getDbid()), d0.isSuspended() ); - return dRef; + String name = d0.getName(); + + // strip path info + if(name.indexOf("/")!=-1) + { + name = name.substring(name.lastIndexOf("/")+1, name.length()); + } + + dRef.setName(name); + dRef.setTimestamp(d0.getTimestamp()); + + return dRef; } }