[jbpm-commits] JBoss JBPM SVN: r3101 - in projects/gwt-console/trunk/server: src/main/java/org/jboss/bpm/console/server and 3 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Wed Nov 26 09:07:30 EST 2008


Author: thomas.diesler at jboss.com
Date: 2008-11-26 09:07:30 -0500 (Wed, 26 Nov 2008)
New Revision: 3101

Added:
   projects/gwt-console/trunk/server/deploy.sh
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ExtensionManagement.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java
Removed:
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/JBPM3Extension.java
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/ProcessMgmtFacade.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TestFacade.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ManagementFactory.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/JBPM3ManagementExtension.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/JBPM3ManagementFactory.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/JBPM3ProcessManagement.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java
Log:
More spec integration

Added: projects/gwt-console/trunk/server/deploy.sh
===================================================================
--- projects/gwt-console/trunk/server/deploy.sh	                        (rev 0)
+++ projects/gwt-console/trunk/server/deploy.sh	2008-11-26 14:07:30 UTC (rev 3101)
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+cp target/gwt-console-server.war $JBOSS422/server/default/deploy/jbpm


Property changes on: projects/gwt-console/trunk/server/deploy.sh
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

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-11-26 12:01:31 UTC (rev 3100)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/JBPM3MgmtFacade.java	2008-11-26 14:07:30 UTC (rev 3101)
@@ -30,7 +30,7 @@
 import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo;
 import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
 import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
-import org.jboss.bpm.console.server.integration.JBPM3Extension;
+import org.jboss.bpm.console.server.integration.ExtensionManagement;
 import org.jboss.bpm.console.server.integration.ManagementFactory;
 import org.jboss.bpm.console.server.integration.ProcessManagement;
 import org.jboss.bpm.console.server.gson.GsonFactory;
@@ -54,7 +54,7 @@
 {
    private static final Log log = LogFactory.getLog(JBPM3MgmtFacade.class);
 
-   private JBPM3Extension JBPM3Extension = null;
+   private ExtensionManagement extensionManagement = null;
    private ProcessManagement processManagement = null;
 
    private ProcessManagement getProcessManagement()
@@ -70,15 +70,15 @@
 
    }
 
-   private JBPM3Extension getManagementExtension()
+   private ExtensionManagement getManagementExtension()
    {
-      if(null==this.JBPM3Extension)
+      if(null==this.extensionManagement)
       {
          ManagementFactory factory = ManagementFactory.newInstance();
-         this.JBPM3Extension = factory.createExtensionManagement();
+         this.extensionManagement = factory.createExtensionManagement();
       }
 
-      return this.JBPM3Extension;
+      return this.extensionManagement;
 
    }
 

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-26 12:01:31 UTC (rev 3100)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java	2008-11-26 14:07:30 UTC (rev 3101)
@@ -29,7 +29,7 @@
 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.ExtensionManagement;
 import org.jboss.bpm.console.server.integration.ManagementFactory;
 import org.jboss.bpm.console.server.integration.ProcessManagement;
 
@@ -46,7 +46,7 @@
 {
    private static final Log log = LogFactory.getLog(ProcessMgmtFacade.class);
    private ProcessManagement processManagement;
-   private JBPM3Extension managementExtension;
+   private ExtensionManagement managementExtension;
 
    private ProcessManagement getProcessManagement()
    {
@@ -60,7 +60,7 @@
       return this.processManagement;
    }
 
-   private JBPM3Extension getManagementExtension()
+   private ExtensionManagement getManagementExtension()
    {
       if(null==this.managementExtension)
       {
@@ -79,7 +79,7 @@
    public Response getDefinitionsJSON()
    {
       ProcessDefinitionRefWrapper wrapper =
-            new ProcessDefinitionRefWrapper(getProcessManagement().getAllDefinitions());
+            new ProcessDefinitionRefWrapper(getProcessManagement().getProcessDefinitions());
       return createJsonResponse(wrapper);
    }
 
@@ -92,7 +92,7 @@
    )
    {
       ProcessDefinitionRefWrapper wrapper =
-            new ProcessDefinitionRefWrapper( getProcessManagement().removeDefinition(processId));
+            new ProcessDefinitionRefWrapper( getProcessManagement().removeProcessDefinition(processId));
       return createJsonResponse(wrapper);
    }
 
@@ -106,7 +106,7 @@
    {
 
       ProcessInstanceRefWrapper wrapper =
-            new ProcessInstanceRefWrapper(getProcessManagement().getInstancesByDefinitionId(processId));
+            new ProcessInstanceRefWrapper(getProcessManagement().getProcessInstances(processId));
       return createJsonResponse(wrapper);
    }
 

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java	2008-11-26 12:01:31 UTC (rev 3100)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java	2008-11-26 14:07:30 UTC (rev 3101)
@@ -29,7 +29,7 @@
 import org.jboss.bpm.console.client.model.forms.FormDef;
 import org.jboss.bpm.console.client.model.util.MapEntry;
 import org.jboss.bpm.console.server.gson.GsonFactory;
-import org.jboss.bpm.console.server.integration.JBPM3Extension;
+import org.jboss.bpm.console.server.integration.ExtensionManagement;
 import org.jboss.bpm.console.server.integration.ManagementFactory;
 import org.jboss.bpm.console.server.integration.TaskManagement;
 import org.jboss.bpm.console.server.integration.jbpm3.JBPM3FormParser;
@@ -52,7 +52,7 @@
    private static final Log log = LogFactory.getLog(TaskMgmtFacade.class);
 
    private TaskManagement taskManagement;
-   private JBPM3Extension JBPM3Extension;
+   private ExtensionManagement JBPM3Extension;
 
    /**
     * Lazy load the {@link org.jboss.bpm.console.server.integration.ProcessManagement}
@@ -69,7 +69,7 @@
       return this.taskManagement;
    }
 
-   private JBPM3Extension getManagementExtension()
+   private ExtensionManagement getManagementExtension()
    {
       if(null==this.JBPM3Extension)
       {

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TestFacade.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TestFacade.java	2008-11-26 12:01:31 UTC (rev 3100)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TestFacade.java	2008-11-26 14:07:30 UTC (rev 3101)
@@ -24,7 +24,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
-import org.jboss.bpm.console.server.integration.JBPM3Extension;
+import org.jboss.bpm.console.server.integration.ExtensionManagement;
 import org.jboss.bpm.console.server.integration.ManagementFactory;
 import org.jboss.bpm.console.server.integration.ProcessManagement;
 
@@ -47,10 +47,10 @@
 {
    private static final Log log = LogFactory.getLog(TaskMgmtFacade.class);
    
-   private JBPM3Extension JBPM3Extension;
+   private ExtensionManagement JBPM3Extension;
    private ProcessManagement processManagement;      
 
-   private JBPM3Extension getManagementExtension()
+   private ExtensionManagement getManagementExtension()
    {
       if(null==this.JBPM3Extension)
       {
@@ -108,14 +108,14 @@
    @Path("undeploy/harness")
    public Response undeployTestHarness()
    {
-      List<ProcessDefinitionRef> defs = getProcessManagement().getAllDefinitions();
+      List<ProcessDefinitionRef> defs = getProcessManagement().getProcessDefinitions();
       
       for(ProcessDefinitionRef pd : defs)
       {
          if(pd.getName().equals("GWT_Test_Harness"))
          {
             log.info("Remove test harness " +pd);
-            getProcessManagement().removeDefinition(pd.getProcessId());
+            getProcessManagement().removeProcessDefinition(pd.getProcessId());
          }
       }
       return Response.ok().build();

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java	2008-11-26 12:01:31 UTC (rev 3100)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java	2008-11-26 14:07:30 UTC (rev 3101)
@@ -54,7 +54,7 @@
       if(null==userManagement)
       {
          ManagementFactory factory = ManagementFactory.newInstance();
-         this.userManagement = factory.createUsermanagement();         
+         this.userManagement = factory.createUserManagement();         
       }
 
       return this.userManagement;

Copied: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ExtensionManagement.java (from rev 3100, projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/JBPM3Extension.java)
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ExtensionManagement.java	                        (rev 0)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ExtensionManagement.java	2008-11-26 14:07:30 UTC (rev 3101)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.server.integration;
+
+import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
+import org.jboss.bpm.console.client.model.ProcessInstanceRef;
+import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo;
+import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
+
+import java.util.Map;
+
+/**
+ * Proprietary to jBPM3, no sure if it will stay.
+ * 
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public interface ExtensionManagement
+{
+   byte[] getProcessImage(long processId);
+
+   DiagramInfo getDiagramInfo(long processId);
+
+   ActiveNodeInfo getActivNodeInfo(long instanceId);
+
+   Map<String, String> getAvailableTaskForms(long processId);
+
+   byte[] getTaskFormByTaskName(long processId, long taskId);
+
+   void changeInstanceState(long instanceId, ProcessInstanceRef.STATE nextState);
+
+   ProcessDefinitionRef deployNewDefinition(byte[] data);
+}

Deleted: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/JBPM3Extension.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/JBPM3Extension.java	2008-11-26 12:01:31 UTC (rev 3100)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/JBPM3Extension.java	2008-11-26 14:07:30 UTC (rev 3101)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.server.integration;
-
-import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
-import org.jboss.bpm.console.client.model.ProcessInstanceRef;
-import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo;
-import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
-
-import java.util.Map;
-
-/**
- * Proprietary to jBPM3, no sure if it will stay.
- * 
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
-public interface JBPM3Extension
-{
-   byte[] getProcessImage(long processId);
-
-   DiagramInfo getDiagramInfo(long processId);
-
-   ActiveNodeInfo getActivNodeInfo(long instanceId);
-
-   Map<String, String> getAvailableTaskForms(long processId);
-
-   byte[] getTaskFormByTaskName(long processId, long taskId);
-
-   void changeInstanceState(long instanceId, ProcessInstanceRef.STATE nextState);
-
-   ProcessDefinitionRef deployNewDefinition(byte[] data);
-}

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ManagementFactory.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ManagementFactory.java	2008-11-26 12:01:31 UTC (rev 3100)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ManagementFactory.java	2008-11-26 14:07:30 UTC (rev 3101)
@@ -21,40 +21,30 @@
  */
 package org.jboss.bpm.console.server.integration;
 
-import org.jboss.bpm.console.server.util.ServiceLoader;
+// $Id: $
 
+import org.jboss.bpm.console.server.integration.jbpm3.JBPM3ManagementFactory;
+import org.jboss.bpm.console.server.integration.spec.ManagementFactoryImpl;
+
 /**
- * Construct management implementations.
- * Defaults to <code>org.jboss.bpm.console.server.integration.jbpm3.JBPM3ManagementFactory</code>
- *
- * @see org.jboss.bpm.console.server.util.ServiceLoader
+ * Construct management implementation
  * 
  * @author Heiko.Braun <heiko.braun at jboss.com>
+ * @author Thomas.Diesler at jboss.com
  */
 public abstract class ManagementFactory
 {
-   private static final String DEFAULT_FACTORY = "org.jboss.bpm.console.server.integration.jbpm3.JBPM3ManagementFactory";
+  public static ManagementFactory newInstance()
+  {
+    // return new ManagementFactoryImpl();
+    return new JBPM3ManagementFactory();
+  }
+  
+  public abstract ProcessManagement createProcessManagement();
 
-   public abstract ProcessManagement createProcessManagement();
-   
-   public abstract JBPM3Extension createExtensionManagement();
+  public abstract ExtensionManagement createExtensionManagement();
 
-   public abstract TaskManagement createTaskManagement();
+  public abstract TaskManagement createTaskManagement();
 
-   public abstract UserManagement createUsermanagement();
-   
-   /**
-    * Load a ManagementFactory through {@link org.jboss.bpm.console.server.util.ServiceLoader}
-    * @return a ManagementFactory implementation
-    */
-   public static ManagementFactory newInstance()
-   {
-      ManagementFactory factory = (ManagementFactory)
-            ServiceLoader.loadFromServices(ManagementFactory.class.getName(), DEFAULT_FACTORY);
-      if(null==factory)
-         throw new RuntimeException("Failed to load ManagementFactory.");
-
-      return factory;
-   }
-
+  public abstract UserManagement createUserManagement();
 }

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java	2008-11-26 12:01:31 UTC (rev 3100)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java	2008-11-26 14:07:30 UTC (rev 3101)
@@ -28,20 +28,21 @@
 
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>
+ * @author Thomas.Diesler at jboss.com
  */
 public interface ProcessManagement
 {
-   List<ProcessDefinitionRef> getAllDefinitions();
+   List<ProcessDefinitionRef> getProcessDefinitions();
 
-   ProcessDefinitionRef getDefinitionById(long processId);
+   ProcessDefinitionRef getProcessDefinition(long procDefId);
 
-   List<ProcessDefinitionRef> removeDefinition(long processId);
+   List<ProcessDefinitionRef> removeProcessDefinition(long procDefId);
 
-   List<ProcessInstanceRef> getInstancesByDefinitionId(long processId);
+   List<ProcessInstanceRef> getProcessInstances(long procDefId);
 
-   ProcessInstanceRef getInstanceById(long instanceId);
+   ProcessInstanceRef getProcessInstance(long procId);
 
-   ProcessInstanceRef newInstance(long processId);
+   ProcessInstanceRef newInstance(long procDefId);
 
    void signalToken(long tokenId, String signal);
 }

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/JBPM3ManagementExtension.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/JBPM3ManagementExtension.java	2008-11-26 12:01:31 UTC (rev 3100)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/JBPM3ManagementExtension.java	2008-11-26 14:07:30 UTC (rev 3101)
@@ -25,7 +25,7 @@
 import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo;
 import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
 import org.jboss.bpm.console.client.model.jbpm3.DiagramNodeInfo;
-import org.jboss.bpm.console.server.integration.JBPM3Extension;
+import org.jboss.bpm.console.server.integration.ExtensionManagement;
 import org.jbpm.file.def.FileDefinition;
 import org.jbpm.graph.def.ProcessDefinition;
 import org.jbpm.graph.exe.ProcessInstance;
@@ -43,7 +43,7 @@
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>
  */
-public class JBPM3ManagementExtension implements JBPM3Extension
+public class JBPM3ManagementExtension implements ExtensionManagement
 {
    private JBPM3CommandDelegate delegate;
 

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/JBPM3ManagementFactory.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/JBPM3ManagementFactory.java	2008-11-26 12:01:31 UTC (rev 3100)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/JBPM3ManagementFactory.java	2008-11-26 14:07:30 UTC (rev 3101)
@@ -35,9 +35,9 @@
       return (ProcessManagement) InvocationProxy.newInstance(new JBPM3ProcessManagement());
    }
 
-   public JBPM3Extension createExtensionManagement()
+   public ExtensionManagement createExtensionManagement()
    {
-      return (JBPM3Extension) InvocationProxy.newInstance( new JBPM3ManagementExtension() );
+      return (ExtensionManagement) InvocationProxy.newInstance( new JBPM3ManagementExtension() );
    }
 
 
@@ -47,7 +47,7 @@
    }
 
 
-   public UserManagement createUsermanagement()
+   public UserManagement createUserManagement()
    {
       return (UserManagement) InvocationProxy.newInstance( new JBPM3UserManagement() );
    }

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/JBPM3ProcessManagement.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/JBPM3ProcessManagement.java	2008-11-26 12:01:31 UTC (rev 3100)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/JBPM3ProcessManagement.java	2008-11-26 14:07:30 UTC (rev 3101)
@@ -42,7 +42,7 @@
       this.delegate = new JBPM3CommandDelegate();
    }
 
-   public List<ProcessDefinitionRef> getAllDefinitions()
+   public List<ProcessDefinitionRef> getProcessDefinitions()
    {
       List<ProcessDefinition> defs = delegate.getActualDefinitions();
 
@@ -54,16 +54,16 @@
       return results;
    }
 
-   public ProcessDefinitionRef getDefinitionById(long processId)
+   public ProcessDefinitionRef getProcessDefinition(long processId)
    {
       ProcessDefinition p0 = delegate.getActualDefinition(processId);
       return Transform.processDefinition(p0);
    }
 
-   public List<ProcessDefinitionRef> removeDefinition(long processId)
+   public List<ProcessDefinitionRef> removeProcessDefinition(long processId)
    {
       delegate.removeActualDefinition(processId);
-      return getAllDefinitions();
+      return getProcessDefinitions();
    }
 
 
@@ -73,7 +73,7 @@
       return Transform.processInstance(instance);  
    }
 
-   public List<ProcessInstanceRef> getInstancesByDefinitionId(long processId)
+   public List<ProcessInstanceRef> getProcessInstances(long processId)
    {
       List<ProcessInstance> instances = delegate.getActualInstances(processId);
       List<ProcessInstanceRef> results = new ArrayList<ProcessInstanceRef>(instances.size());
@@ -84,7 +84,7 @@
       return results;
    }
 
-   public ProcessInstanceRef getInstanceById(long instanceId)
+   public ProcessInstanceRef getProcessInstance(long instanceId)
    {
       ProcessInstance instance = delegate.getActualInstance(instanceId);
       return Transform.processInstance(instance);

Added: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java	                        (rev 0)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java	2008-11-26 14:07:30 UTC (rev 3101)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.server.integration.spec;
+
+import org.jboss.bpm.console.server.integration.ExtensionManagement;
+import org.jboss.bpm.console.server.integration.InvocationProxy;
+import org.jboss.bpm.console.server.integration.ManagementFactory;
+import org.jboss.bpm.console.server.integration.ProcessManagement;
+import org.jboss.bpm.console.server.integration.TaskManagement;
+import org.jboss.bpm.console.server.integration.UserManagement;
+import org.jboss.bpm.console.server.integration.jbpm3.JBPM3ManagementExtension;
+import org.jboss.bpm.console.server.integration.jbpm3.JBPM3TaskManagement;
+import org.jboss.bpm.console.server.integration.jbpm3.JBPM3UserManagement;
+
+/**
+ * Wraps management instances in {@link InvocationProxy}
+ * @author Thomas.Diesler at jboss.com
+ */
+public class ManagementFactoryImpl extends ManagementFactory
+{
+   public ProcessManagement createProcessManagement()
+   {
+      return (ProcessManagement) InvocationProxy.newInstance(new ProcessManagementImpl());
+   }
+
+   public ExtensionManagement createExtensionManagement()
+   {
+      return (ExtensionManagement) InvocationProxy.newInstance( new JBPM3ManagementExtension() );
+   }
+
+   public TaskManagement createTaskManagement()
+   {
+      return (TaskManagement) InvocationProxy.newInstance( new JBPM3TaskManagement() );
+   }
+
+   public UserManagement createUserManagement()
+   {
+      return (UserManagement) InvocationProxy.newInstance( new JBPM3UserManagement() );
+   }
+}


Property changes on: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

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-26 12:01:31 UTC (rev 3100)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java	2008-11-26 14:07:30 UTC (rev 3101)
@@ -27,6 +27,8 @@
 
 import javax.management.ObjectName;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
 import org.jboss.bpm.console.client.model.ProcessInstanceRef;
 import org.jboss.bpm.console.server.integration.ProcessManagement;
@@ -47,81 +49,95 @@
  */
 public class ProcessManagementImpl implements ProcessManagement
 {
-  public List<ProcessDefinitionRef> getAllDefinitions()
+  private static final Log log = LogFactory.getLog(ProcessManagementImpl.class);
+  
+  public List<ProcessDefinitionRef> getProcessDefinitions()
   {
+    log.info("getProcessDefinitions");
+    
     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);
+      
+      log.info(procDef);
+      
       ProcessDefinitionRef pdRef = adaptProcessDefinition(procDef);
       results.add(pdRef);
     }
-
     return results;
   }
 
-  public ProcessDefinitionRef getDefinitionById(long procDefId)
+  public ProcessDefinitionRef getProcessDefinition(long procDefId)
   {
-    ProcessDefinitionRef results = null;
-
-    ProcessDefinition procDef = getProcessDefinitionById(procDefId);
-    if (procDef != null)
-    {
-      results = new ProcessDefinitionRef(procDefId, procDef.getName(), procDef.getVersion());
-    }
-
-    return results;
+    ProcessDefinition procDef = getProcessDefinitionInternal(procDefId);
+    log.info("getProcessDefinition: " + procDef);
+    
+    return procDef != null ? new ProcessDefinitionRef(procDefId, procDef.getName(), procDef.getVersion()) : null;
   }
 
-  public List<ProcessDefinitionRef> removeDefinition(long procDefId)
+  public List<ProcessDefinitionRef> removeProcessDefinition(long procDefId)
   {
-    ProcessDefinition procDef = getProcessDefinitionById(procDefId);
+    ProcessDefinition procDef = getProcessDefinitionInternal(procDefId);
+    log.info("removeDefinition: " + procDef);
+    
     if (procDef != null)
     {
       ProcessDefinitionService pdService = getProcessDefinitionService();
       pdService.unregisterProcessDefinition(procDef.getKey());
     }
-    return getAllDefinitions();
+    return getProcessDefinitions();
   }
 
   public ProcessInstanceRef newInstance(long procDefId)
   {
-    ProcessDefinition procDef = getProcessDefinitionById(procDefId);
+    ProcessDefinition procDef = getProcessDefinitionInternal(procDefId);
+    log.info("newInstance: " + procDef);
+    
     if (procDef == null)
       throw new IllegalStateException("Cannot obtain process definition: " + procDefId);
 
     Process proc = procDef.newInstance();
+    proc.startProcess();
+    
+    log.info("Started: " + proc);
+    
     ProcessInstanceRef procRef = adaptProcess(proc);
     return procRef;
   }
 
-  public List<ProcessInstanceRef> getInstancesByDefinitionId(long procDefId)
+  public List<ProcessInstanceRef> getProcessInstances(long procDefId)
   {
     List<ProcessInstanceRef> results = new ArrayList<ProcessInstanceRef>();
-
-    ProcessDefinition procDef = getProcessDefinitionById(procDefId);
+    ProcessDefinition procDef = getProcessDefinitionInternal(procDefId);
     if (procDef == null)
       throw new IllegalStateException("Cannot obtain process definition: " + procDefId);
 
+    log.info("getProcessInstances: " + procDef);
+    
     ProcessService procService = getProcessService();
     Iterator<ObjectName> itProc = procService.getProcesses(procDef.getKey(), null).iterator();
     while (itProc.hasNext())
     {
       ObjectName procID = itProc.next();
       Process proc = procService.getProcess(procID);
+      
+      log.info(proc);
+      
       results.add(adaptProcess(proc));
     }
 
     return results;
   }
 
-  public ProcessInstanceRef getInstanceById(long procID)
+  public ProcessInstanceRef getProcessInstance(long procID)
   {
     Process proc = getProcessById(procID);
+    log.info("getProcessInstance: " + proc);
+    
     ProcessInstanceRef procRef = adaptProcess(proc);
     return procRef;
   }
@@ -149,6 +165,8 @@
     if (token == null)
       throw new IllegalStateException("Cannot obtain token: " + tokenId);
 
+    log.info("signalToken: " + token);
+    
     // Signal the token
     token.signal(name);
   }
@@ -162,7 +180,7 @@
     return pdService;
   }
 
-  private ProcessDefinition getProcessDefinitionById(long procDefID)
+  private ProcessDefinition getProcessDefinitionInternal(long procDefID)
   {
     ProcessDefinition procDef = null;
     ProcessDefinitionService pdService = getProcessDefinitionService();




More information about the jbpm-commits mailing list