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

Author: heiko.braun(a)jboss.com Date: 2009-02-20 04:51:45 -0500 (Fri, 20 Feb 2009) New Revision: 3967 Modified: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/URLBuilder.java projects/gwt-console/trunk/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/TokenEditorComponent.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/RemoteListView.java Log: Implement 'cancel' process instance Modified: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/URLBuilder.java =================================================================== --- projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2009-02-20 09:51:41 UTC (rev 3966) +++ projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2009-02-20 09:51:45 UTC (rev 3967) @@ -86,8 +86,7 @@ public String getStateChangeURL(String instanceId, ProcessInstanceRef.STATE state) { - String encodedId = URL.encode(instanceId); - return getConsoleServerUrl() + "/rs/process/instances/" + encodedId + "/state/" + state; + return getConsoleServerUrl() + "/rs/process/instances/" + adoptExecutionId(instanceId) + "/state/" + state; } public String getStartNewInstanceURL(String processId) @@ -127,18 +126,18 @@ return getConsoleServerUrl() + "/rs/tasks/" + id + "/assignment" + URL.encode(actualActor); } - public String getTokenSignalUrl(TokenReference tok) + public String getExecutionSignalUrl(TokenReference tok) { - return getConsoleServerUrl() + "/rs/process/tokens/" + adoptTokenId(tok.getId()) + "/transition/default"; + return getConsoleServerUrl() + "/rs/process/tokens/" + adoptExecutionId(tok.getId()) + "/transition/default"; } - public String getTokenSignalUrl(TokenReference tok, String signal) + public String getExecutionSignalUrl(TokenReference tok, String signal) { String encodedSignal = URL.encode(signal); - return getConsoleServerUrl() + "/rs/process/tokens/" + adoptTokenId(tok.getId()) + "/transition?signal=" + encodedSignal; + return getConsoleServerUrl() + "/rs/process/tokens/" + adoptExecutionId(tok.getId()) + "/transition?signal=" + encodedSignal; } - private String adoptTokenId(String actual) + private String adoptExecutionId(String actual) { // TDOD: https://jira.jboss.org/jira/browse/JBPM-2054 return actual.replace("/", "_"); 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 2009-02-20 09:51:41 UTC (rev 3966) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2009-02-20 09:51:45 UTC (rev 3967) @@ -83,11 +83,11 @@ @Produces("application/json") public Response removeDefinitionsJSON( @PathParam("id") - String processId + String definitionId ) { ProcessDefinitionRefWrapper wrapper = - new ProcessDefinitionRefWrapper( getProcessManagement().removeProcessDefinition(processId)); + new ProcessDefinitionRefWrapper( getProcessManagement().removeProcessDefinition(definitionId)); return createJsonResponse(wrapper); } @@ -96,12 +96,11 @@ @Produces("application/json") public Response getInstancesJSON( @PathParam("id") - String processId + String definitionId ) { - ProcessInstanceRefWrapper wrapper = - new ProcessInstanceRefWrapper(getProcessManagement().getProcessInstances(processId)); + new ProcessInstanceRefWrapper(getProcessManagement().getProcessInstances(definitionId)); return createJsonResponse(wrapper); } @@ -110,13 +109,13 @@ @Produces("application/json") public Response newInstance( @PathParam("id") - String processId) + String definitionId) { ProcessInstanceRef instance = null; try { - instance = getProcessManagement().newInstance(processId); + instance = getProcessManagement().newInstance(definitionId); return createJsonResponse(instance); } catch (Throwable t) @@ -131,21 +130,22 @@ @Produces("application/json") public Response changeState( @PathParam("id") - String instanceId, + String executionId, @PathParam("next") String next) { - log.debug("Change instance (ID "+instanceId+") to state " +next); + String actualExecutionId = adoptExecutionId(executionId); + log.debug("Change instance (ID "+actualExecutionId+") to state " +next); - ProcessInstanceRef.STATE state = ProcessInstanceRef.STATE.valueOf(next); - getProcessManagement().setProcessState(instanceId, state); + //ProcessInstanceRef.STATE state = ProcessInstanceRef.STATE.valueOf(next); + getProcessManagement().setProcessState(actualExecutionId, ProcessInstanceRef.STATE.ENDED); return Response.ok().type("application/json").build(); } @POST @Path("tokens/{id}/transition") @Produces("application/json") - public Response signalToken( + public Response signalExecution( @PathParam("id") String id, @QueryParam("signal") @@ -156,24 +156,24 @@ if ("default transition".equals(signalName)) signalName = null; - getProcessManagement().signalToken(adoptTokenId(id), signalName); + getProcessManagement().signalExecution(adoptExecutionId(id), signalName); return Response.ok().type("application/json").build(); } @POST @Path("tokens/{id}/transition/default") @Produces("application/json") - public Response signalTokenDefault( + public Response signalExecutionDefault( @PathParam("id") String id) { log.debug("Signal token " + id); - getProcessManagement().signalToken(adoptTokenId(id), null); + getProcessManagement().signalExecution(adoptExecutionId(id), null); return Response.ok().type("application/json").build(); } - private String adoptTokenId(String modified) + private String adoptExecutionId(String modified) { // TODO: https://jira.jboss.org/jira/browse/JBPM-2054 return modified.replace("_", "/"); Modified: projects/gwt-console/trunk/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java =================================================================== --- projects/gwt-console/trunk/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java 2009-02-20 09:51:41 UTC (rev 3966) +++ projects/gwt-console/trunk/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java 2009-02-20 09:51:45 UTC (rev 3967) @@ -48,7 +48,7 @@ void setProcessState(String instanceId, STATE nextState); - void signalToken(String tokenId, String signal); + void signalExecution(String executionId, String signal); void deploy(String fileName, String contentType, InputStream deployment); } Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java 2009-02-20 09:51:41 UTC (rev 3966) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java 2009-02-20 09:51:45 UTC (rev 3967) @@ -68,6 +68,10 @@ public void onExamine(final int row) { + + MessageBox.alert("Not implemented yet"); + + /* ProcessInstanceRef instance = row2InstanceMap.get(row); String id = ProcessInstanceView.ID + "." + instance.getId(); Editor editor = (Editor) ComponentMgr.getComponent(ProcessEditor.ID); @@ -82,6 +86,7 @@ { t.printStackTrace(); } + */ } public void onDelete(final int row) @@ -89,8 +94,8 @@ MessageBox.show(new MessageBoxConfig() { { - setTitle("Delete process instance?"); - setMsg("Would you like to delete this process instance?"); + setTitle("Cancel process instance"); + setMsg("Would you like to cancel this process instance?"); setButtons(MessageBox.YESNOCANCEL); setCallback(new MessageBox.PromptCallback() { @@ -117,7 +122,7 @@ public void onError(Request request, Throwable t) { // auth failed - ConsoleLog.error("Failed to remove process instance", t); + ConsoleLog.error("Failed to cancel process instance", t); } }); } Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/TokenEditorComponent.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/TokenEditorComponent.java 2009-02-20 09:51:41 UTC (rev 3966) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/TokenEditorComponent.java 2009-02-20 09:51:45 UTC (rev 3967) @@ -169,8 +169,8 @@ { String url = signal.equals(UIConstants.DEFAULT_TRANSITION) ? - mainView.getUrlBuilder().getTokenSignalUrl(tok) : - mainView.getUrlBuilder().getTokenSignalUrl(tok, signal); + mainView.getUrlBuilder().getExecutionSignalUrl(tok) : + mainView.getUrlBuilder().getExecutionSignalUrl(tok, signal); RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, url); Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/RemoteListView.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/RemoteListView.java 2009-02-20 09:51:41 UTC (rev 3966) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/RemoteListView.java 2009-02-20 09:51:45 UTC (rev 3967) @@ -51,7 +51,7 @@ { protected int selectedRowIndex = -1; protected ApplicationContext view; - public static final int PAGE_SIZE = 25; + public static final int PAGE_SIZE = 15; private GridPanel grid; protected String title;