[jbpm-commits] JBoss JBPM SVN: r2571 - in jbpm3/trunk/modules/gwt-console: 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
Tue Oct 21 11:57:36 EDT 2008
Author: heiko.braun at jboss.com
Date: 2008-10-21 11:57:36 -0400 (Tue, 21 Oct 2008)
New Revision: 2571
Modified:
jbpm3/trunk/modules/gwt-console/server/pom.xml
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/JBPM3Management.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3CommandDelegate.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3ProcessDAO.java
jbpm3/trunk/modules/gwt-console/server/src/main/webapp/index.html
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java
Log:
Added possibility to delete definitions. Fix instance retrieval according to parent version
Modified: jbpm3/trunk/modules/gwt-console/server/pom.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/pom.xml 2008-10-21 15:56:41 UTC (rev 2570)
+++ jbpm3/trunk/modules/gwt-console/server/pom.xml 2008-10-21 15:57:36 UTC (rev 2571)
@@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<name>JBoss jBPM3 - GWT Console (Server)</name>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>gwt-console-server</artifactId>
+ <artifactId>gwt-console-server-war</artifactId>
<packaging>war</packaging>
<!-- Parent -->
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/JBPM3Management.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/JBPM3Management.java 2008-10-21 15:56:41 UTC (rev 2570)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/JBPM3Management.java 2008-10-21 15:57:36 UTC (rev 2571)
@@ -74,6 +74,7 @@
@POST
@Path("definitions/new")
@Produces("application/json")
+ @Consumes("multipart/form-data")
public void postNewDefinition(
@Context
HttpServletRequest request
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3CommandDelegate.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3CommandDelegate.java 2008-10-21 15:56:41 UTC (rev 2570)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3CommandDelegate.java 2008-10-21 15:57:36 UTC (rev 2571)
@@ -102,6 +102,12 @@
return match;
}
+ public void removeActualDefinition(long processId)
+ {
+ org.jbpm.graph.def.ProcessDefinition def = getActualDefinition(processId);
+ facade.execute( new DeleteProcessdefinitionCommand(processId));
+ }
+
public org.jbpm.graph.exe.ProcessInstance getActualInstance(long instanceId)
{
org.jbpm.graph.exe.ProcessInstance instance = (org.jbpm.graph.exe.ProcessInstance)
@@ -113,7 +119,7 @@
{
org.jbpm.graph.def.ProcessDefinition p0 = getActualDefinition(processId);
GetProcessInstancesCommand command = new GetProcessInstancesCommand();
- command.setProcessName(p0.getName());
+ command.setProcessId(processId);
List<org.jbpm.graph.exe.ProcessInstance> instances =
(List<org.jbpm.graph.exe.ProcessInstance>) facade.execute(command);
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3ProcessDAO.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3ProcessDAO.java 2008-10-21 15:56:41 UTC (rev 2570)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3ProcessDAO.java 2008-10-21 15:57:36 UTC (rev 2571)
@@ -60,7 +60,8 @@
public List<ProcessDefinition> removeDefinition(long processId)
{
- throw new RuntimeException("Not implemented");
+ delegate.removeActualDefinition(processId);
+ return getAllDefinitions();
}
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/webapp/index.html
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/webapp/index.html 2008-10-21 15:56:41 UTC (rev 2570)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/webapp/index.html 2008-10-21 15:57:36 UTC (rev 2571)
@@ -87,6 +87,13 @@
<td>Retrieve a process definition coordinates (GPD) of the active node</td>
<td>application/json</td>
</tr>
+
+ <tr>
+ <td>POST</td>
+ <td>/rs/jbpm3/definitions/new</td>
+ <td>Upload a new process definition</td>
+ <td>Accept:multipart/form-data<br>Produce:application/json</td>
+ </tr>
</table>
<h2>Example usage</h2>
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2008-10-21 15:56:41 UTC (rev 2570)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2008-10-21 15:57:36 UTC (rev 2571)
@@ -84,7 +84,7 @@
protected void onExamine(int row)
{
ProcessDefinition proc = row2ProcessMap.get(row);
- String editorId = ProcessInstanceEditor.ID+"."+proc.getName();
+ String editorId = ProcessInstanceEditor.createWidgetID(proc);
if(view.hasEditorView(editorId))
view.showEditor(editorId);
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java 2008-10-21 15:56:41 UTC (rev 2570)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java 2008-10-21 15:57:36 UTC (rev 2571)
@@ -169,4 +169,9 @@
{
return "bpm-instance-icon";
}
+
+ public static String createWidgetID(ProcessDefinition parent)
+ {
+ return ProcessInstanceEditor.ID+"."+parent.getName()+"."+parent.getVersion();
+ }
}
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java 2008-10-21 15:56:41 UTC (rev 2570)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java 2008-10-21 15:57:36 UTC (rev 2571)
@@ -65,7 +65,7 @@
this.parent = proc;
this.view = view;
- this.setId(ProcessInstanceEditor.ID+"."+proc.getName());
+ this.setId( ProcessInstanceEditor.createWidgetID(proc) );
// --------------------------------------------------
@@ -245,7 +245,7 @@
public String getTitle()
{
- return parent.getName();
+ return parent.getName()+" (#"+parent.getVersion()+")";
}
More information about the jbpm-commits
mailing list