[jbpm-commits] JBoss JBPM SVN: r2798 - in projects/gwt-console/trunk: server/src/main/java/org/jboss/bpm/console/server/dao and 3 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Nov 7 06:38:51 EST 2008
Author: heiko.braun at jboss.com
Date: 2008-11-07 06:38:51 -0500 (Fri, 07 Nov 2008)
New Revision: 2798
Removed:
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDAOFactory.java
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDiagramDAO.java
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockProcessDAO.java
Modified:
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/JBPM3Management.java
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessManagement.java
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TaskManagement.java
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3TaskDAO.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java
Log:
Use ServiceLoader instead of servlet context parameter to get to the DAOFactory implementation
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/JBPM3Management.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/JBPM3Management.java 2008-11-07 11:34:24 UTC (rev 2797)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/JBPM3Management.java 2008-11-07 11:38:51 UTC (rev 2798)
@@ -47,11 +47,11 @@
private DiagramDAO diagramDAO = null;
private ProcessDAO processDAO = null;
- private ProcessDAO getProcessDAO(HttpServletRequest request)
+ private ProcessDAO getProcessDAO()
{
if(null==this.processDAO)
{
- DAOFactory factory = DAOFactory.newInstance(request.getSession().getServletContext());
+ DAOFactory factory = DAOFactory.newInstance();
this.processDAO = factory.createProcessDAO();
}
@@ -59,11 +59,11 @@
}
- private DiagramDAO getDiagramDAO(HttpServletRequest request)
+ private DiagramDAO getDiagramDAO()
{
if(null==this.diagramDAO)
{
- DAOFactory factory = DAOFactory.newInstance(request.getSession().getServletContext());
+ DAOFactory factory = DAOFactory.newInstance();
this.diagramDAO = factory.createDiagramDAO();
}
@@ -107,7 +107,7 @@
// Process a file upload in memory
byte[] data = item.get();
- getProcessDAO(request).deployNewDefinition(data);
+ getProcessDAO().deployNewDefinition(data);
// Process stream
//InputStream uploadedStream = item.getInputStream();
@@ -129,12 +129,10 @@
@Produces("image/jpeg")
public Response getProcessImage(
@PathParam("id")
- long id,
- @Context
- HttpServletRequest request
+ long id
)
{
- byte[] image = getDiagramDAO(request).getProcessImage(id);
+ byte[] image = getDiagramDAO().getProcessImage(id);
if(null==image)
return Response.serverError().build();
else
@@ -146,12 +144,10 @@
@Produces("application/json")
public DiagramInfo getDiagramInfo(
@PathParam("id")
- long id,
- @Context
- HttpServletRequest request
+ long id
)
{
- return getDiagramDAO(request).getDiagramInfo(id);
+ return getDiagramDAO().getDiagramInfo(id);
}
@GET
@@ -159,12 +155,10 @@
@Produces("application/json")
public ActiveNodeInfo getActiveNodeInfo(
@PathParam("id")
- long id,
- @Context
- HttpServletRequest request
+ long id
)
{
- ActiveNodeInfo activNodeInfo = getDiagramDAO(request).getActivNodeInfo(id);
+ ActiveNodeInfo activNodeInfo = getDiagramDAO().getActivNodeInfo(id);
return activNodeInfo;
}
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessManagement.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessManagement.java 2008-11-07 11:34:24 UTC (rev 2797)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessManagement.java 2008-11-07 11:38:51 UTC (rev 2798)
@@ -48,11 +48,11 @@
/**
* Lazy load the {@link org.jboss.bpm.console.server.dao.ProcessDAO}
*/
- private ProcessDAO getProcessDAO(HttpServletRequest request)
+ private ProcessDAO getProcessDAO()
{
if(null==this.processDAO)
{
- DAOFactory factory = DAOFactory.newInstance(request.getSession().getServletContext());
+ DAOFactory factory = DAOFactory.newInstance();
this.processDAO = factory.createProcessDAO();
}
@@ -62,13 +62,10 @@
@GET
@Path("definitions")
@Produces("application/json")
- public Response getDefinitionsJSON(
- @Context
- HttpServletRequest request
- )
+ public Response getDefinitionsJSON()
{
ProcessDefinitionWrapper wrapper =
- new ProcessDefinitionWrapper(getProcessDAO(request).getAllDefinitions());
+ new ProcessDefinitionWrapper(getProcessDAO().getAllDefinitions());
return createJsonResponse(wrapper);
}
@@ -77,13 +74,11 @@
@Produces("application/json")
public Response removeDefinitionsJSON(
@PathParam("id")
- long processId,
- @Context
- HttpServletRequest request
+ long processId
)
{
ProcessDefinitionWrapper wrapper =
- new ProcessDefinitionWrapper( getProcessDAO(request).removeDefinition(processId));
+ new ProcessDefinitionWrapper( getProcessDAO().removeDefinition(processId));
return createJsonResponse(wrapper);
}
@@ -92,13 +87,12 @@
@Produces("application/json")
public Response getInstancesJSON(
@PathParam("id")
- long processId,
- @Context
- HttpServletRequest request)
+ long processId
+ )
{
ProcessInstanceWrapper wrapper =
- new ProcessInstanceWrapper(getProcessDAO(request).getInstancesByProcessId(processId));
+ new ProcessInstanceWrapper(getProcessDAO().getInstancesByProcessId(processId));
return createJsonResponse(wrapper);
}
@@ -107,12 +101,10 @@
@Produces("application/json")
public Response newInstance(
@PathParam("id")
- long processId,
- @Context
- HttpServletRequest request)
+ long processId)
{
- ProcessInstance instance = getProcessDAO(request).newInstance(processId);
+ ProcessInstance instance = getProcessDAO().newInstance(processId);
return createJsonResponse(instance);
}
@@ -123,11 +115,9 @@
@PathParam("id")
long instanceId,
@PathParam("next")
- String next,
- @Context
- HttpServletRequest request)
+ String next)
{
- getProcessDAO(request).changeState(instanceId, next);
+ getProcessDAO().changeState(instanceId, next);
return Response.ok().build();
}
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TaskManagement.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TaskManagement.java 2008-11-07 11:34:24 UTC (rev 2797)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TaskManagement.java 2008-11-07 11:38:51 UTC (rev 2798)
@@ -42,7 +42,7 @@
import java.util.StringTokenizer;
/**
- * REST server module for accessing process related data.
+ * REST server module for accessing task related data.
*
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
@@ -54,11 +54,11 @@
/**
* Lazy load the {@link org.jboss.bpm.console.server.dao.ProcessDAO}
*/
- private TaskDAO getTaskDAO(HttpServletRequest request)
+ private TaskDAO getTaskDAO()
{
if(null==this.taskDAO)
{
- DAOFactory factory = DAOFactory.newInstance(request.getSession().getServletContext());
+ DAOFactory factory = DAOFactory.newInstance();
this.taskDAO = factory.createTaskDAO();
}
@@ -69,8 +69,6 @@
@Path("actor")
@Produces("application/json")
public Response getTasksForActor(
- @Context
- HttpServletRequest request,
@QueryParam("actors")
String actors
)
@@ -84,7 +82,7 @@
}
TaskReferenceWrapper wrapper =
- new TaskReferenceWrapper(getTaskDAO(request).getTasksByActors(actorList));
+ new TaskReferenceWrapper(getTaskDAO().getTasksByActors(actorList));
return createJsonResponse(wrapper);
}
@@ -92,14 +90,12 @@
@Path("forms/{processId}")
@Produces("application/json")
public Response getTasksForms(
- @Context
- HttpServletRequest request,
@PathParam("processId")
long processId
)
{
Map<String,String> formMapping =
- getTaskDAO(request).getAvailableTaskForms(processId);
+ getTaskDAO().getAvailableTaskForms(processId);
List<MapEntry> entries = new ArrayList<MapEntry>();
for(String s : formMapping.keySet())
@@ -114,8 +110,6 @@
@Path("forms/{processId}/{taskId}")
@Produces("application/json")
public Response getTasksFormByTaskId(
- @Context
- HttpServletRequest request,
@PathParam("processId")
long processId,
@PathParam("taskId")
@@ -123,7 +117,7 @@
)
{
- byte[] form = getTaskDAO(request).getTaskFormByTaskName(processId, taskId);
+ byte[] form = getTaskDAO().getTaskFormByTaskName(processId, taskId);
JBPM3FormParser parser = new JBPM3FormParser();
final FormDef formDef = new FormDef("taskform-"+taskId);
try
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java 2008-11-07 11:34:24 UTC (rev 2797)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java 2008-11-07 11:38:51 UTC (rev 2798)
@@ -21,12 +21,8 @@
*/
package org.jboss.bpm.console.server.dao;
-import org.jboss.bpm.console.server.dao.DiagramDAO;
+import org.jboss.bpm.console.server.util.ServiceLoader;
-import javax.servlet.ServletContext;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
@@ -39,25 +35,17 @@
public abstract TaskDAO createTaskDAO();
/**
- * Expects an init parameter <code>org.jboss.bpm.console.server.dao.DAOFactory</code>
- * refering to the implementation class name that should be created.
- * @param context ServletContext
+ * Load a DAOFactory through {@link org.jboss.bpm.console.server.util.ServiceLoader}
* @return a DAOFactory implementation
*/
- public static DAOFactory newInstance(ServletContext context)
+ public static DAOFactory newInstance()
{
- String daoFactoryClassName = context.getInitParameter(DAOFactory.class.getName());
- if(null==daoFactoryClassName)
- throw new RuntimeException("Failed to load DAOFactory. Init parameter " +
- DAOFactory.class.getName() + " is missing");
+ DAOFactory factory = (DAOFactory)
+ ServiceLoader.loadFromServices(DAOFactory.class.getName(), "org.jboss.bpm.console.server.dao.internal.JBPM3DAOFactory");
+ if(null==factory)
+ throw new RuntimeException("Failed to load DAOFactory.");
- try
- {
- return (DAOFactory)Class.forName(daoFactoryClassName).newInstance();
- }
- catch (Exception e)
- {
- throw new RuntimeException("Failed to load DAOFactory", e);
- }
+ return factory;
}
+
}
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3TaskDAO.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3TaskDAO.java 2008-11-07 11:34:24 UTC (rev 2797)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3TaskDAO.java 2008-11-07 11:38:51 UTC (rev 2798)
@@ -57,7 +57,12 @@
taskRefs.add( Transform.taskInstance(t0));
}
- return taskRefs;
+ List<TaskReference> copy = new ArrayList<TaskReference>();
+ for(TaskReference ref : taskRefs)
+ {
+ copy.add(ref);
+ }
+ return copy;
}
// TODO: If not requred please remove
Deleted: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDAOFactory.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDAOFactory.java 2008-11-07 11:34:24 UTC (rev 2797)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDAOFactory.java 2008-11-07 11:38:51 UTC (rev 2798)
@@ -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.dao.internal;
-
-import org.jboss.bpm.console.server.dao.DAOFactory;
-import org.jboss.bpm.console.server.dao.ProcessDAO;
-import org.jboss.bpm.console.server.dao.DiagramDAO;
-import org.jboss.bpm.console.server.dao.TaskDAO;
-import org.jboss.bpm.console.server.dao.internal.MockDiagramDAO;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
-public class MockDAOFactory extends DAOFactory
-{
- public ProcessDAO createProcessDAO()
- {
- return new MockProcessDAO();
- }
-
- public DiagramDAO createDiagramDAO()
- {
- return new MockDiagramDAO();
- }
-
-
- public TaskDAO createTaskDAO()
- {
- throw new RuntimeException("Not implemented");
- }
-}
-
Deleted: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDiagramDAO.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDiagramDAO.java 2008-11-07 11:34:24 UTC (rev 2797)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDiagramDAO.java 2008-11-07 11:38:51 UTC (rev 2798)
@@ -1,102 +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.dao.internal;
-
-import org.jboss.bpm.console.client.model.ProcessInstance;
-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.dao.ProcessDAO;
-import org.jboss.bpm.console.server.dao.DiagramDAO;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
-public class MockDiagramDAO extends MockProcessDAO implements DiagramDAO
-{
-
- public MockDiagramDAO()
- {
- super();
- }
-
- public byte[] getProcessImage(long processId)
- {
- byte[] imageBytes = null;
-
- try
- {
- InputStream in = MockDiagramDAO.class.getResourceAsStream("1.jpg");
- if(null==in)
- throw new IllegalArgumentException("Failed to load image resource");
- imageBytes = new byte[in.available()];
- in.read(imageBytes);
-
- } catch (IOException e)
- {
- e.printStackTrace();
- }
-
- return imageBytes;
- }
-
- public DiagramInfo getDiagramInfo(long processId)
- {
- InputStream in = MockDiagramDAO.class.getResourceAsStream("gpd.xml");
- if(null==in)
- throw new IllegalArgumentException("Failed to load diagram info");
-
- return DiagramInfoParser.parse(in);
- }
-
- public ActiveNodeInfo getActivNodeInfo(long instanceId)
- {
-
- ProcessInstance pi = super.getInstanceById(instanceId);
- DiagramInfo diagram = getDiagramInfo(pi.getParentId());
- List<DiagramNodeInfo> nodes = diagram.getNodeList();
-
- DiagramNodeInfo activeNode = null;
- int i = 0;
- for(DiagramNodeInfo n : nodes)
- {
- // TODO: Fake. Actually this should retrieve the active node
- if(i==1)
- {
- activeNode = n;
- break;
- }
-
- i++;
-
- }
-
- if(null==activeNode)
- throw new RuntimeException("Failed to retrieve active node for instanceId " + instanceId);
-
- return new ActiveNodeInfo(diagram.getWidth(), diagram.getHeight(), activeNode);
- }
-}
Deleted: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockProcessDAO.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockProcessDAO.java 2008-11-07 11:34:24 UTC (rev 2797)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockProcessDAO.java 2008-11-07 11:38:51 UTC (rev 2798)
@@ -1,158 +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.dao.internal;
-
-import org.jboss.bpm.console.client.model.ProcessDefinition;
-import org.jboss.bpm.console.client.model.ProcessInstance;
-import org.jboss.bpm.console.client.model.TaskReference;
-import org.jboss.bpm.console.server.dao.ProcessDAO;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
-public class MockProcessDAO implements ProcessDAO
-{
-
- final static List<ProcessDefinition> defs = new ArrayList<ProcessDefinition>();
- static
- {
- defs.add( new ProcessDefinition(1, "OrderProcess", "1"));
- defs.add( new ProcessDefinition(2, "VacationManagement", "1"));
- defs.add( new ProcessDefinition(3, "New Employee walkthrough", "1"));
- defs.add( new ProcessDefinition(4, "Source code review", "2"));
- defs.add( new ProcessDefinition(5, "Loan application", "1"));
- defs.add( new ProcessDefinition(6, "Expense report review", "4"));
- defs.add( new ProcessDefinition(7, "Expense claim", "4"));
- defs.add( new ProcessDefinition(8, "Credit approval", "4"));
- }
-
- final static List<ProcessInstance> instances = new ArrayList<ProcessInstance>();
- static
- {
- instances.add( new ProcessInstance(2, -1, new Date(), null, false));
- instances.add( new ProcessInstance(3, -1, new Date(System.currentTimeMillis()-(1000*60*120)), new Date(System.currentTimeMillis()-(1000*60*12)), false));
- instances.add( new ProcessInstance(4, -1, new Date(System.currentTimeMillis()-(1000*60*60)), new Date(System.currentTimeMillis()-(1000*60*24)), false));
- instances.add( new ProcessInstance(5, -1, new Date(System.currentTimeMillis()-(1000*60*90)), new Date(System.currentTimeMillis()-(1000*60*17)), false));
- instances.add( new ProcessInstance(6, -1, new Date(), null, true));
- instances.add( new ProcessInstance(7, -1, new Date(), null, true));
- }
-
- public List<ProcessDefinition> getAllDefinitions()
- {
- return defs;
- }
-
- public ProcessDefinition getDefinitionById(long id)
- {
- ProcessDefinition match = null;
- for(ProcessDefinition pd : defs)
- {
- if(pd.getProcessId() == id)
- {
- match = pd;
- break;
- }
- }
- return match;
- }
-
-
- public List<ProcessDefinition> removeDefinition(long processId)
- {
- System.out.println("Remove definition " + processId);
-
- ProcessDefinition toBeRemoved = null;
- for(ProcessDefinition pd : defs)
- {
- if(processId == pd.getProcessId())
- toBeRemoved = pd;
- }
-
- if(null==toBeRemoved)
- throw new IllegalArgumentException("No process with id " + processId);
- else
- defs.remove(toBeRemoved);
-
- return defs;
- }
-
- public List<ProcessInstance> getInstancesByProcessId(long id)
- {
- return instances;
- }
-
-
- public void changeState(long instanceId, String nextState)
- {
-
- System.out.println("Change instance state" + instanceId + " to " + nextState);
-
- ProcessInstance toBeChanged = null;
- for(ProcessInstance instance : instances)
- {
- if(instanceId == instance.getInstanceId())
- toBeChanged = instance;
- }
-
- if(null==toBeChanged)
- throw new IllegalArgumentException("No process with id " + instanceId);
-
- toBeChanged.setState(nextState);
- }
-
- public ProcessInstance getInstanceById(long instanceId)
- {
- ProcessInstance match = null;
- for(ProcessInstance instance : instances)
- {
- if(instanceId == instance.getInstanceId())
- match = instance;
- }
-
- if(null==match)
- throw new IllegalArgumentException("No instance with id " + instanceId);
-
- return match;
- }
-
-
- public ProcessInstance newInstance(long processId)
- {
- throw new RuntimeException("Not implemented");
- }
-
-
- public ProcessDefinition deployNewDefinition(byte[] data)
- {
- throw new RuntimeException("Not implemented");
- }
-
-
- public List<TaskReference> getAllTasks()
- {
- throw new RuntimeException("Not implemented");
- }
-}
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2008-11-07 11:34:24 UTC (rev 2797)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2008-11-07 11:38:51 UTC (rev 2798)
@@ -85,6 +85,9 @@
public static TaskReference parseTaskReference(JSONObject item)
{
+
+ System.out.println("Parsing " + item.toString());
+
long id = JSONWalk.on(item).next("id").asLong();
long tokenId = JSONWalk.on(item).next("tokenId").asLong();
long instanceId = JSONWalk.on(item).next("processInstanceId").asLong();
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java 2008-11-07 11:34:24 UTC (rev 2797)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java 2008-11-07 11:38:51 UTC (rev 2798)
@@ -93,7 +93,16 @@
public void onRequestComplete(JavaScriptObject json)
{
JSONObject root = new JSONObject(json);
- FormDef formDef = DTOParser.parseFormDef(root);
+ FormDef formDef = null;
+ try
+ {
+ formDef = DTOParser.parseFormDef(root);
+ }
+ catch (Throwable e)
+ {
+ System.out.println("FormDef parsing failed" + e.getMessage());
+ e.printStackTrace();
+ }
MessageBox.hide();
More information about the jbpm-commits
mailing list