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

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Jul 2 15:32:13 EDT 2009


Author: heiko.braun at jboss.com
Date: 2009-07-02 15:32:12 -0400 (Thu, 02 Jul 2009)
New Revision: 5193

Removed:
   projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TestFacade.java
Modified:
   projects/gwt-console/trunk/server/server-core/server-core.iml
   projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java
   projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/FormProcessingFacade.java
   projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java
   projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java
   projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/FormDispatcherPlugin.java
Log:
Cleanup FormDispatcherPlugin API

Modified: projects/gwt-console/trunk/server/server-core/server-core.iml
===================================================================
--- projects/gwt-console/trunk/server/server-core/server-core.iml	2009-07-02 16:38:22 UTC (rev 5192)
+++ projects/gwt-console/trunk/server/server-core/server-core.iml	2009-07-02 19:32:12 UTC (rev 5193)
@@ -17,6 +17,15 @@
     <orderEntry type="module" module-name="server-integration" exported="" />
     <orderEntry type="module" module-name="report-server" exported="" />
     <orderEntry type="library" name="jaxb-impl-2.1" level="application" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
 </module>

Modified: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java	2009-07-02 16:38:22 UTC (rev 5192)
+++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java	2009-07-02 19:32:12 UTC (rev 5193)
@@ -42,8 +42,7 @@
     singletons.add(new ProcessMgmtFacade());
     singletons.add(new TaskListFacade());
     singletons.add(new TaskMgmtFacade());
-    singletons.add(new UserMgmtFacade());
-    singletons.add(new TestFacade());
+    singletons.add(new UserMgmtFacade());    
     singletons.add(new EngineFacade());
     singletons.add(new FormProcessingFacade());
     singletons.add(new ReportFacade() );

Modified: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/FormProcessingFacade.java
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/FormProcessingFacade.java	2009-07-02 16:38:22 UTC (rev 5192)
+++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/FormProcessingFacade.java	2009-07-02 19:32:12 UTC (rev 5193)
@@ -23,6 +23,10 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jboss.bpm.console.client.model.ProcessInstanceRef;
+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.plugin.FormAuthorityRef;
 import org.jboss.bpm.console.server.plugin.FormDispatcherPlugin;
 import org.jboss.bpm.console.server.plugin.PluginMgr;
@@ -59,9 +63,40 @@
 
   private FormDispatcherPlugin formPlugin;
 
+  private ProcessManagement processManagement;
+
+  private TaskManagement taskManagement;
+
   /**
    * Lazy load the {@link org.jboss.bpm.console.server.integration.TaskManagement}
    */
+  private TaskManagement getTaskManagement()
+  {
+    if(null==this.taskManagement)
+    {
+      ManagementFactory factory = ManagementFactory.newInstance();
+      this.taskManagement = factory.createTaskManagement();
+      log.debug("Using ManagementFactory impl:" + factory.getClass().getName());
+    }
+
+    return this.taskManagement;
+  }
+  
+  private ProcessManagement getProcessManagement()
+  {
+    if(null==this.processManagement)
+    {
+      ManagementFactory factory = ManagementFactory.newInstance();
+      this.processManagement = factory.createProcessManagement();
+      log.debug("Using ManagementFactory impl:" + factory.getClass().getName());
+    }
+
+    return this.processManagement;
+  }
+
+  /**
+   * Lazy load the {@link org.jboss.bpm.console.server.integration.TaskManagement}
+   */
   private FormDispatcherPlugin getFormDispatcherPlugin()
   {
     if(null==this.formPlugin)
@@ -111,8 +146,11 @@
     Map<String,Object> processVars = createVariableMapping(payload);
 
     // complete task
-    getFormDispatcherPlugin().processCompletion(
-        new FormAuthorityRef(taskId), processVars, request.getRemoteUser(), (String)processVars.get("outcome")
+    getTaskManagement().completeTask(
+        Long.valueOf(taskId), // TODO: change to string id's
+        String.valueOf(processVars.get("outcome")), // actually a plugin implementation detail
+        processVars,
+        request.getRemoteUser()
     );
 
     return Response.ok("Successfully processed input").build();
@@ -132,12 +170,8 @@
   {
     Map<String,Object> processVars = createVariableMapping(payload);
 
-    // complete task
-    FormAuthorityRef authref = new FormAuthorityRef(definitionId, FormAuthorityRef.Type.PROCESS);
-    getFormDispatcherPlugin().processCompletion(
-        authref, processVars, request.getRemoteUser(),
-        (String)processVars.get("outcome")
-    );
+    // start process
+    ProcessInstanceRef instance = getProcessManagement().newInstance(definitionId, processVars);
 
     return Response.ok("Successfully processed input").build();
   }

Modified: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java	2009-07-02 16:38:22 UTC (rev 5192)
+++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java	2009-07-02 19:32:12 UTC (rev 5193)
@@ -25,27 +25,14 @@
 import org.apache.commons.logging.LogFactory;
 import org.jboss.bpm.console.server.integration.ManagementFactory;
 import org.jboss.bpm.console.server.integration.TaskManagement;
-import org.jboss.bpm.console.server.plugin.PluginMgr;
-import org.jboss.bpm.console.server.plugin.FormAuthorityRef;
 import org.jboss.bpm.console.server.plugin.FormDispatcherPlugin;
+import org.jboss.bpm.console.server.plugin.PluginMgr;
 import org.jboss.bpm.console.server.util.RsComment;
-import org.jboss.resteasy.plugins.providers.multipart.InputPart;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
 
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.*;
 import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
 
 /**
  * REST server module for accessing task related data.
@@ -158,101 +145,4 @@
     return Response.ok().build();
   }
 
-  /*
-  @GET
-  @Path("{taskId}/render")
-  @Produces("text/html")
-  public Response renderUI(
-      @PathParam("taskId")
-      String taskId
-  )
-  {
-    DataHandler dh = getFormDispatcherPlugin().provideForm(
-      new FormAuthorityRef(taskId)
-    );
-    
-    if(null==dh)
-    {
-      throw new RuntimeException("No UI associated with task ID " + taskId);
-    }
-
-    return Response.ok(dh.getDataSource()).type("text/html").build();
-  }
-
-  @POST
-  @Path("{taskId}/process")
-  @Produces("text/html")
-  @Consumes("multipart/form-data")
-  public Response closeWithUI(
-      @Context
-      HttpServletRequest request,
-      @PathParam("taskId")
-      String taskId,
-      MultipartFormDataInput payload
-  )
-  {
-    Map<String,Object> processVars = new HashMap<String,Object>();
-
-    Map<String,InputPart> formData = payload.getFormData();
-    Iterator<String> partNames = formData.keySet().iterator();
-
-    String outcome = null;
-    
-    while(partNames.hasNext())
-    {
-      final String partName = partNames.next();
-      final InputPart part = formData.get(partName);
-      final MediaType mediaType = part.getMediaType();
-
-      if(partName.equals("outcome"))
-      {
-        outcome = part.getBodyAsString();      
-      }
-      else if(MediaType.TEXT_PLAIN_TYPE.equals(mediaType))
-      {
-        // RFC2045: Each part has an optional "Content-Type" header
-        // that defaults to "text/plain".
-        // Can go into process without conversion
-        processVars.put(partName, part.getBodyAsString()); 
-      }
-      else
-      {
-        // anything else turns into a DataHandler
-        final byte[] data = part.getBodyAsString().getBytes();
-        DataHandler dh = new DataHandler(
-            new DataSource()
-            {
-              public InputStream getInputStream() throws IOException
-              {
-                return new ByteArrayInputStream(data);
-              }
-
-              public OutputStream getOutputStream() throws IOException
-              {
-                throw new RuntimeException("This is a readonly DataHandler"); 
-              }
-
-              public String getContentType()
-              {
-                return mediaType.getType();
-              }
-
-              public String getName()
-              {
-                return partName;
-              }
-            }
-        );
-
-        processVars.put(partName, dh);        
-      }
-    }
-
-    // complete task
-    getFormDispatcherPlugin().processCompletion(
-        new FormAuthorityRef(taskId), processVars, request.getRemoteUser(), outcome
-    );
-
-    return Response.ok("Successfully processed task UI").build();
-  } */
 }

Deleted: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TestFacade.java
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TestFacade.java	2009-07-02 16:38:22 UTC (rev 5192)
+++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TestFacade.java	2009-07-02 19:32:12 UTC (rev 5193)
@@ -1,98 +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;
-
-import com.google.gson.Gson;
-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.gson.GsonFactory;
-import org.jboss.bpm.console.server.integration.ManagementFactory;
-import org.jboss.bpm.console.server.integration.ProcessManagement;
-
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
-import java.io.InputStream;
-import java.util.List;
-
-/**
- * Test utility to simplify GWT tests.
- *
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
- at Path("test")
-public class TestFacade
-{
-  private static final Log log = LogFactory.getLog(TaskMgmtFacade.class);
-
-  private ProcessManagement processManagement;
-  private static final String SAMPLE_PROCESS_PAR = "/process.jpdl.xml";
-
-  private ProcessManagement getProcessManagement()
-  {
-    if(null==this.processManagement)
-    {
-      ManagementFactory factory = ManagementFactory.newInstance();
-      this.processManagement = factory.createProcessManagement();
-      log.debug("Using ManagementFactory impl:" + factory.getClass().getName());
-    }
-
-    return this.processManagement;
-  }
-
-  @POST
-  @Path("deploy/harness")
-  public Response deployTestHarness()
-  {
-    InputStream in = getClass().getResourceAsStream(SAMPLE_PROCESS_PAR);
-    if(null==in)
-      throw new RuntimeException("Failed to read test deployment: " + SAMPLE_PROCESS_PAR);
-
-    getProcessManagement().deploy("test.jpdl.xml", "text/xml", in);
-    return Response.ok().build();
-  }
-
-  @POST
-  @Path("undeploy/harness")
-  public Response undeployTestHarness()
-  {
-    List<ProcessDefinitionRef> defs = getProcessManagement().getProcessDefinitions();
-
-    for(ProcessDefinitionRef pd : defs)
-    {
-      if(pd.getName().equals("GWT_Test_Harness"))
-      {
-        log.info("Remove test harness " +pd);
-        getProcessManagement().removeProcessDefinition(pd.getId());
-      }
-    }
-    return Response.ok().build();
-  }
-
-  private Response createJsonResponse(Object wrapper)
-  {
-    Gson gson = GsonFactory.createInstance();
-    String json = gson.toJson(wrapper);
-    return Response.ok(json).type("application/json").build();
-  }
-}

Modified: projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java
===================================================================
--- projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java	2009-07-02 16:38:22 UTC (rev 5192)
+++ projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java	2009-07-02 19:32:12 UTC (rev 5193)
@@ -45,8 +45,10 @@
 
   ProcessInstanceRef getProcessInstance(String instanceId);
 
-  ProcessInstanceRef newInstance(String instanceId);
+  ProcessInstanceRef newInstance(String defintionId);
 
+  ProcessInstanceRef newInstance(String definitionId, Map<String, Object> processVars);
+  
   Map<String, Object> getInstanceData(String instanceId);
 
   void setInstanceData(String instanceId, Map<String, Object> data);
@@ -59,6 +61,4 @@
 
   void signalExecution(String executionId, String signal);
 
-  @Deprecated
-  void deploy(String fileName, String contentType, InputStream deployment);
 }

Modified: projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/FormDispatcherPlugin.java
===================================================================
--- projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/FormDispatcherPlugin.java	2009-07-02 16:38:22 UTC (rev 5192)
+++ projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/FormDispatcherPlugin.java	2009-07-02 19:32:12 UTC (rev 5193)
@@ -35,8 +35,4 @@
   URL getDispatchUrl(FormAuthorityRef ref);
   
   DataHandler provideForm(FormAuthorityRef ref);
-
-  void processCompletion(
-      FormAuthorityRef ref, Map<String, Object> payload,
-      String performingUser, String outcome);
 }




More information about the jbpm-commits mailing list