[jbpm-commits] JBoss JBPM SVN: r5121 - jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console.

[do-not-reply at jboss.org]

Author: heiko.braun at jboss.com
Date: 2009-06-25 09:22:08 -0400 (Thu, 25 Jun 2009)
New Revision: 5121

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/ModelAdaptor.java
   jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
Log:
Process definition state in console model

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-25 12:55:05 UTC (rev 5120)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/DeploymentPluginImpl.java	2009-06-25 13:22:08 UTC (rev 5121)
@@ -70,7 +70,6 @@
         }
 
         // suspended  processes
-        /*    TODO: Uncomment when JBPM-2355 is done
         ProcessDefinitionQuery pdQuery2 = repositoryService.createProcessDefinitionQuery();
         pdQuery2.deploymentDbid(dpl.getDbid());
         pdQuery2.suspended();
@@ -81,7 +80,6 @@
           ref.getDefinitions().add(p.getId());
         }
 
-        */
         results.add(ref);
       }
 

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-25 12:55:05 UTC (rev 5120)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java	2009-06-25 13:22:08 UTC (rev 5121)
@@ -55,8 +55,7 @@
 
     //def.setDescription(processDefinition.getDescription());
     def.setPackageName(cast.getPackageName());
-    def.setDeploymentId(String.valueOf(cast.getDeploymentDbid()));
-    
+    def.setDeploymentId(String.valueOf(cast.getDeploymentDbid()));    
     return def;
 
   }

Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java	2009-06-25 12:55:05 UTC (rev 5120)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java	2009-06-25 13:22:08 UTC (rev 5121)
@@ -57,16 +57,29 @@
       List<ProcessDefinitionRef> results = new ArrayList<ProcessDefinitionRef>();
 
       RepositoryService repositoryService = this.processEngine.getRepositoryService();
-      List<ProcessDefinition> definitions = repositoryService.createProcessDefinitionQuery()
+
+      // active processes
+      List<ProcessDefinition> activePds = repositoryService.createProcessDefinitionQuery()
           .orderAsc(ProcessDefinitionQuery.PROPERTY_NAME)
           .list();
-
-      // adopt ProcessDefinition to console model
-      for(ProcessDefinition processDefinition : definitions)
+     
+      for(ProcessDefinition processDefinition : activePds)
       {
         results.add( ModelAdaptor.adoptDefinition(processDefinition) );
       }
 
+      // suspended  processes
+      ProcessDefinitionQuery pdQuery2 = repositoryService.createProcessDefinitionQuery();
+      pdQuery2.suspended();
+      List<ProcessDefinition> suspendedPds = pdQuery2.list();
+
+      for(ProcessDefinition p : suspendedPds)
+      {
+        ProcessDefinitionRef pref = ModelAdaptor.adoptDefinition(p);
+        pref.setSuspended(true);
+        results.add(pref);
+      }
+
       return results;
     }
     finally