[jbpm-commits] JBoss JBPM SVN: r3960 - in projects/gwt-console/trunk: server and 3 other directories.

Author: heiko.braun(a)jboss.com Date: 2009-02-19 15:53:59 -0500 (Thu, 19 Feb 2009) New Revision: 3960 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/gwt-server.iml projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java projects/gwt-console/trunk/server/src/main/resources/process.jpdl.xml Log: Implement signaling on executions 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-19 20:21:15 UTC (rev 3959) +++ projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2009-02-19 20:53:59 UTC (rev 3960) @@ -129,15 +129,21 @@ public String getTokenSignalUrl(TokenReference tok) { - return getConsoleServerUrl() + "/rs/jbpm3/tokens/" + tok.getId() + "/transition/default"; + return getConsoleServerUrl() + "/rs/process/tokens/" + adoptTokenId(tok.getId()) + "/transition/default"; } public String getTokenSignalUrl(TokenReference tok, String signal) { String encodedSignal = URL.encode(signal); - return getConsoleServerUrl() + "/rs/jbpm3/tokens/" + tok.getId() + "/transition?signal=" + encodedSignal; + return getConsoleServerUrl() + "/rs/process/tokens/" + adoptTokenId(tok.getId()) + "/transition?signal=" + encodedSignal; } + private String adoptTokenId(String actual) + { + // TDOD: https://jira.jboss.org/jira/browse/JBPM-2054 + return actual.replace("/", "_"); + } + public String getAvailableActorsUrl(String actorId) { return getConsoleServerUrl() + "/rs/identity/user/" + actorId + "/actors"; Modified: projects/gwt-console/trunk/server/gwt-server.iml =================================================================== --- projects/gwt-console/trunk/server/gwt-server.iml 2009-02-19 20:21:15 UTC (rev 3959) +++ projects/gwt-console/trunk/server/gwt-server.iml 2009-02-19 20:53:59 UTC (rev 3960) @@ -11,6 +11,8 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="gwt-parent" /> + <orderEntry type="module" module-name="gwt-server-integration" /> + <orderEntry type="module" module-name="gwt-rpc" /> <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/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-19 20:21:15 UTC (rev 3959) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2009-02-19 20:53:59 UTC (rev 3960) @@ -143,6 +143,43 @@ } @POST + @Path("tokens/{id}/transition") + @Produces("application/json") + public Response signalToken( + @PathParam("id") + String id, + @QueryParam("signal") + String signalName) + { + log.debug("Signal token " + id + " -> " + signalName); + + if ("default transition".equals(signalName)) + signalName = null; + + getProcessManagement().signalToken(adoptTokenId(id), signalName); + return Response.ok().type("application/json").build(); + } + + @POST + @Path("tokens/{id}/transition/default") + @Produces("application/json") + public Response signalTokenDefault( + @PathParam("id") + String id) + { + log.debug("Signal token " + id); + + getProcessManagement().signalToken(adoptTokenId(id), null); + return Response.ok().type("application/json").build(); + } + + private String adoptTokenId(String modified) + { + // TODO: https://jira.jboss.org/jira/browse/JBPM-2054 + return modified.replace("_", "/"); + } + + @POST @Path("definitions/new") @Produces("application/json") @Consumes("multipart/form-data") Modified: projects/gwt-console/trunk/server/src/main/resources/process.jpdl.xml =================================================================== --- projects/gwt-console/trunk/server/src/main/resources/process.jpdl.xml 2009-02-19 20:21:15 UTC (rev 3959) +++ projects/gwt-console/trunk/server/src/main/resources/process.jpdl.xml 2009-02-19 20:53:59 UTC (rev 3960) @@ -14,6 +14,10 @@ <flow to="c" /> </state> - <state name="c" g="308,16,76,52" /> + <state name="c" g="308,16,76,52" > + <flow to="end"/> + </state> + <end name="end" g="239,40,48,48"/> + </process> \ No newline at end of file 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-19 20:21:15 UTC (rev 3959) +++ projects/gwt-console/trunk/server-integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java 2009-02-19 20:53:59 UTC (rev 3960) @@ -48,7 +48,7 @@ void setProcessState(String instanceId, STATE nextState); - void signalToken(long tokenId, String signal); + void signalToken(String tokenId, String signal); void deploy(String fileName, String contentType, InputStream deployment); }