[jbpm-commits] JBoss JBPM SVN: r4845 - in projects/gwt-console/trunk: gui/war and 11 other directories.

Author: heiko.braun(a)jboss.com Date: 2009-05-19 06:31:12 -0400 (Tue, 19 May 2009) New Revision: 4845 Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteInstanceAction.java Modified: projects/gwt-console/trunk/gui/war/gui-war.iml projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/StateChangeAction.java projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/URLBuilder.java projects/gwt-console/trunk/gui/workspace-api/workspace-api.iml projects/gwt-console/trunk/gui/workspace-example/workspace-example.iml projects/gwt-console/trunk/gwt-parent.iml projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceRef.java 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/ProcessMgmtFacade.java projects/gwt-console/trunk/server/server-integration/server-integration.iml projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java Log: Fix JBPM-2267: Separate delete/end operations. DateFormat added Modified: projects/gwt-console/trunk/gui/war/gui-war.iml =================================================================== --- projects/gwt-console/trunk/gui/war/gui-war.iml 2009-05-19 10:08:29 UTC (rev 4844) +++ projects/gwt-console/trunk/gui/war/gui-war.iml 2009-05-19 10:31:12 UTC (rev 4845) @@ -11,7 +11,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-rpc" /> + <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module" module-name="workspace-api" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java =================================================================== --- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java 2009-05-19 10:08:29 UTC (rev 4844) +++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java 2009-05-19 10:31:12 UTC (rev 4845) @@ -125,8 +125,8 @@ "<ul>"+ "<li>URL: '" + url + "'\n"+ "<li>Action: '" + getId() + "'\n" + - "<li>Exception: '" + t.getClass() + - "</ul>'\n\n"+ + "<li>Exception: '" + t.getClass() +"'"+ + "</ul>\n\n"+ t.getMessage(); ConsoleLog.error(out, t); Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteInstanceAction.java =================================================================== --- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteInstanceAction.java (rev 0) +++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteInstanceAction.java 2009-05-19 10:31:12 UTC (rev 4845) @@ -0,0 +1,75 @@ +/* + * 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.client.process; + +import org.jboss.bpm.console.client.common.AbstractRESTAction; +import org.jboss.bpm.console.client.ApplicationContext; +import org.jboss.bpm.console.client.model.ProcessInstanceRef; +import org.jboss.bpm.console.client.model.ProcessDefinitionRef; +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.Response; +import com.mvc4g.client.Controller; +import com.mvc4g.client.Event; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public class DeleteInstanceAction extends AbstractRESTAction +{ + + public final static String ID = DeleteInstanceAction.class.getName(); + + public DeleteInstanceAction(ApplicationContext appContetext) + { + super(appContetext); + } + + public String getId() + { + return ID; + } + + public String getUrl(Object event) + { + ProcessInstanceRef instance = (ProcessInstanceRef)event; + return appContext.getUrlBuilder().getInstanceDeleteURL(instance.getId()); + } + + public RequestBuilder.Method getRequestMethod() + { + return RequestBuilder.POST; + } + + public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) + { + DefinitionListView view = (DefinitionListView)controller.getView(DefinitionListView.ID); + ProcessDefinitionRef proc = view.getSelection(); + + // refresh instances + controller.handleEvent( + new Event( + LoadInstancesAction.ID, + proc + ) + ); + } +} Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java =================================================================== --- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java 2009-05-19 10:08:29 UTC (rev 4844) +++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java 2009-05-19 10:31:12 UTC (rev 4845) @@ -39,6 +39,7 @@ import org.jboss.bpm.console.client.model.ProcessInstanceRef; import java.util.List; +import java.text.SimpleDateFormat; /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; @@ -59,6 +60,8 @@ private List<ProcessInstanceRef> cachedInstances = null; + private SimpleDateFormat dateFormat = new SimpleDateFormat(); + public InstanceListView() { super(); @@ -96,8 +99,8 @@ case 1: listBox.setText(row, column, item.getState().toString()); break; - case 2: - listBox.setText(row, column, item.getStartDate().toString()); + case 2: + listBox.setText(row, column, dateFormat.format(item.getStartDate())); break; default: throw new RuntimeException("Unexpected column size"); @@ -117,7 +120,7 @@ // update details controller.handleEvent( new Event(UpdateInstanceDetailAction.ID, item) - ); + ); } else { @@ -134,7 +137,7 @@ // toolbar final LayoutPanel toolBox = new LayoutPanel(); toolBox.setPadding(0); - toolBox.setWidgetSpacing(5); + toolBox.setWidgetSpacing(5); final ToolBar toolBar = new ToolBar(); toolBar.add( @@ -154,16 +157,28 @@ toolBar.addSeparator(); toolBar.add( - new ToolButton("Start new instance", new ClickListener() + new ToolButton("Start", new ClickListener() { public void onClick(Widget sender) { - controller.handleEvent( - new Event( - StartNewInstanceAction.ID, - getCurrentDefinition() - ) - ); + MessageBox.confirm("Start new execution", + "Do you want to start a new execution of this process?", + new MessageBox.ConfirmationCallback() { + public void onResult(boolean doIt) + { + + if(doIt) + { + controller.handleEvent( + new Event( + StartNewInstanceAction.ID, + getCurrentDefinition() + ) + ); + } + } + }); + } } ) @@ -172,21 +187,33 @@ toolBar.addSeparator(); toolBar.add( - new ToolButton("Cancel execution", new ClickListener() + new ToolButton("Terminate", new ClickListener() { public void onClick(Widget sender) { - ProcessInstanceRef selection = getSelection(); - if(selection!=null) + + if(getSelection()!=null) { - selection.setState(ProcessInstanceRef.STATE.ENDED); - controller.handleEvent( - new Event( - StateChangeAction.ID, - selection - ) - ); + MessageBox.confirm("Terminate instance", + "Terminating this instance will stop further execution.", + new MessageBox.ConfirmationCallback() { + public void onResult(boolean doIt) + { + if(doIt) + { + ProcessInstanceRef selection = getSelection(); + selection.setState(ProcessInstanceRef.STATE.ENDED); + selection.setEndResult(ProcessInstanceRef.RESULT.OBSOLETE); + controller.handleEvent( + new Event( + StateChangeAction.ID, + selection + ) + ); + } + } + }); } else { @@ -197,6 +224,47 @@ ) ); + toolBar.addSeparator(); + + toolBar.add( + new ToolButton("Delete", new ClickListener() + { + public void onClick(Widget sender) + { + + if(getSelection()!=null) + { + MessageBox.confirm("Delete instance", + "Deleting this instance will remove any history information and associated tasks as well.", + new MessageBox.ConfirmationCallback() { + public void onResult(boolean doIt) + { + + if(doIt) + { + ProcessInstanceRef selection = getSelection(); + selection.setState(ProcessInstanceRef.STATE.ENDED); + + controller.handleEvent( + new Event( + DeleteInstanceAction.ID, + selection + ) + ); + } + } + }); + + } + else + { + MessageBox.alert("Missing selection", "Please select an instance"); + } + } + } + ) + ); + toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); instanceList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); @@ -250,7 +318,7 @@ if(isInitialized()) { bindData(instances); - } + } } private void bindData(List<ProcessInstanceRef> instances) Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java =================================================================== --- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2009-05-19 10:08:29 UTC (rev 4844) +++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2009-05-19 10:31:12 UTC (rev 4845) @@ -106,6 +106,7 @@ registerAction(StartNewInstanceAction.ID, new StartNewInstanceAction(appContext)); registerAction(StateChangeAction.ID, new StateChangeAction(appContext)); registerAction(DeleteDefinitionAction.ID, new DeleteDefinitionAction(appContext)); + registerAction(DeleteInstanceAction.ID, new DeleteInstanceAction(appContext)); // display tab, needs to visible for correct rendering tabPanel.selectTab(0); Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/StateChangeAction.java =================================================================== --- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/StateChangeAction.java 2009-05-19 10:08:29 UTC (rev 4844) +++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/StateChangeAction.java 2009-05-19 10:31:12 UTC (rev 4845) @@ -52,7 +52,10 @@ public String getUrl(Object event) { final ProcessInstanceRef inst = (ProcessInstanceRef)event; - return appContext.getUrlBuilder().getStateChangeURL(inst.getId(), inst.getState()); + if(ProcessInstanceRef.STATE.ENDED == inst.getState()) + return appContext.getUrlBuilder().getInstanceEndURL(inst.getId(), inst.getEndResult()); + else + return appContext.getUrlBuilder().getStateChangeURL(inst.getId(), inst.getState()); } public RequestBuilder.Method getRequestMethod() Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java =================================================================== --- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2009-05-19 10:08:29 UTC (rev 4844) +++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2009-05-19 10:31:12 UTC (rev 4845) @@ -35,6 +35,7 @@ import org.jboss.bpm.console.client.ApplicationContext; import java.util.List; +import java.text.SimpleDateFormat; /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; @@ -48,6 +49,8 @@ private ApplicationContext appContext; + private SimpleDateFormat dateFormat = new SimpleDateFormat(); + public OpenTasksView(ApplicationContext appContext, TaskDetailView detailView) { super(); @@ -89,8 +92,7 @@ listBox.setText(row, column, String.valueOf(item.getCurrentState())); break; case 3: - String dueDate = item.getDueDate() != null ? String.valueOf(item.getDueDate()) : ""; - listBox.setText(row, column, dueDate); + listBox.setText(row, column, dateFormat.format(item.getDueDate())); break; default: throw new RuntimeException("Unexpected column size"); Modified: projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/URLBuilder.java =================================================================== --- projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2009-05-19 10:08:29 UTC (rev 4844) +++ projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2009-05-19 10:31:12 UTC (rev 4845) @@ -68,7 +68,7 @@ public String getServerStatusURL() { - return getConsoleServerUrl() + "/rs/server/status"; + return getConsoleServerUrl() + "/rs/server/status"; } @Deprecated @@ -94,6 +94,17 @@ return getConsoleServerUrl() + "/rs/process/instances/" + instanceId + "/state/" + state; } + public String getInstanceEndURL(String instanceId, ProcessInstanceRef.RESULT result) + { + return getConsoleServerUrl() + "/rs/process/instances/" + instanceId + "/end/" + result; + } + + public String getInstanceDeleteURL(String instanceId) + { + return getConsoleServerUrl() + "/rs/process/instances/" + instanceId + "/delete"; + } + + public String getStartNewInstanceURL(String processId) { String encodedID = URL.encode(processId); Modified: projects/gwt-console/trunk/gui/workspace-api/workspace-api.iml =================================================================== --- projects/gwt-console/trunk/gui/workspace-api/workspace-api.iml 2009-05-19 10:08:29 UTC (rev 4844) +++ projects/gwt-console/trunk/gui/workspace-api/workspace-api.iml 2009-05-19 10:31:12 UTC (rev 4845) @@ -9,7 +9,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-rpc" exported="" /> + <orderEntry type="module" module-name="gwt-parent" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile"> <CLASSES> Modified: projects/gwt-console/trunk/gui/workspace-example/workspace-example.iml =================================================================== --- projects/gwt-console/trunk/gui/workspace-example/workspace-example.iml 2009-05-19 10:08:29 UTC (rev 4844) +++ projects/gwt-console/trunk/gui/workspace-example/workspace-example.iml 2009-05-19 10:31:12 UTC (rev 4845) @@ -12,7 +12,7 @@ <orderEntry type="module" module-name="toplevel" /> <orderEntry type="module" module-name="plugin-api" /> <orderEntry type="module" module-name="plugin" /> - <orderEntry type="module" module-name="gwt-rpc" /> + <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module" module-name="workspace-api" /> <orderEntry type="module-library"> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> Modified: projects/gwt-console/trunk/gwt-parent.iml =================================================================== --- projects/gwt-console/trunk/gwt-parent.iml 2009-05-19 10:08:29 UTC (rev 4844) +++ projects/gwt-console/trunk/gwt-parent.iml 2009-05-19 10:31:12 UTC (rev 4845) @@ -20,8 +20,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="server-integration" exported="" /> - <orderEntry type="module" module-name="gwt-rpc" exported="" /> <orderEntry type="module" module-name="workspace-api" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: junit:junit:jar:3.8.1:test"> Modified: projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceRef.java =================================================================== --- projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceRef.java 2009-05-19 10:08:29 UTC (rev 4844) +++ projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceRef.java 2009-05-19 10:31:12 UTC (rev 4845) @@ -38,12 +38,22 @@ private String definitionId; private String key; - public enum STATE {RUNNING, SUSPENDED, ENDED}; + /** + * the active state of an instance + */ + public static enum STATE {RUNNING, SUSPENDED, ENDED}; + + /** + * the end state of an instance + */ + public static enum RESULT {COMPLETED, FAILED, ERROR, EXITED, OBSOLETE}; + private Date startDate; private Date endDate; private boolean suspended; + private RESULT endResult; private transient Lifecycle lifecycle; @@ -204,7 +214,7 @@ { nextLifecycle = new Lifecycle(instance, next); instance.suspended = false; - instance.endDate = new Date(); + instance.endDate = new Date(); break; } else @@ -281,7 +291,19 @@ initLifecycle(); } + public RESULT getEndResult() + { + return endResult; + } + public void setEndResult(RESULT endResult) + { + if(getState()!=STATE.ENDED) + throw new IllegalArgumentException("Cannot set end result in state "+getState()); + + this.endResult = endResult; + } + public boolean equals(Object o) { if (this == o) return true; Modified: projects/gwt-console/trunk/server/server-core/server-core.iml =================================================================== --- projects/gwt-console/trunk/server/server-core/server-core.iml 2009-05-19 10:08:29 UTC (rev 4844) +++ projects/gwt-console/trunk/server/server-core/server-core.iml 2009-05-19 10:31:12 UTC (rev 4845) @@ -10,8 +10,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="server-integration" exported="" /> - <orderEntry type="module" module-name="gwt-rpc" exported="" /> + <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> <CLASSES> Modified: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java =================================================================== --- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2009-05-19 10:08:29 UTC (rev 4844) +++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2009-05-19 10:31:12 UTC (rev 4845) @@ -141,6 +141,34 @@ } @POST + @Path("instances/{id}/end/{result}") + @Produces("application/json") + public Response endInstance( + @PathParam("id") + String executionId, + @PathParam("result") + String resultValue) + { + ProcessInstanceRef.RESULT result = ProcessInstanceRef.RESULT.valueOf(resultValue); + log.debug("Change instance (ID "+executionId+") to state " + ProcessInstanceRef.STATE.ENDED); + getProcessManagement().endInstance(executionId, result); + return Response.ok().type("application/json").build(); + } + + @POST + @Path("instances/{id}/delete") + @Produces("application/json") + public Response deleteInstance( + @PathParam("id") + String executionId + ) + { + log.debug("Delete instance (ID "+executionId+")"); + getProcessManagement().deleteInstance(executionId); + return Response.ok().type("application/json").build(); + } + + @POST @Path("tokens/{id}/transition") @Produces("application/json") public Response signalExecution( Modified: projects/gwt-console/trunk/server/server-integration/server-integration.iml =================================================================== --- projects/gwt-console/trunk/server/server-integration/server-integration.iml 2009-05-19 10:08:29 UTC (rev 4844) +++ projects/gwt-console/trunk/server/server-integration/server-integration.iml 2009-05-19 10:31:12 UTC (rev 4845) @@ -8,7 +8,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-rpc" exported="" /> + <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided"> <CLASSES> 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-05-19 10:08:29 UTC (rev 4844) +++ projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java 2009-05-19 10:31:12 UTC (rev 4845) @@ -46,9 +46,14 @@ ProcessInstanceRef newInstance(String instanceId); - void setProcessState(String instanceId, STATE nextState); + void endInstance(String instanceId, ProcessInstanceRef.RESULT result); + void deleteInstance(String instanceId); + + void setProcessState(String instanceId, ProcessInstanceRef.STATE nextState); + void signalExecution(String executionId, String signal); + @Deprecated void deploy(String fileName, String contentType, InputStream deployment); }