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

Author: heiko.braun(a)jboss.com Date: 2008-11-24 07:41:33 -0500 (Mon, 24 Nov 2008) New Revision: 3049 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/integration/ProcessManagement.java projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3CommandDelegate.java projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ProcessManagement.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java projects/gwt-console/trunk/war/src/test/java/PreparationTest.java projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestApplication.java Log: Improve test coverage: deploy test artifacts, first cut 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 2008-11-24 10:12:50 UTC (rev 3048) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2008-11-24 12:41:33 UTC (rev 3049) @@ -27,6 +27,7 @@ import org.jboss.bpm.console.client.model.ProcessDefinitionRefWrapper; import org.jboss.bpm.console.client.model.ProcessInstanceRef; import org.jboss.bpm.console.client.model.ProcessInstanceRefWrapper; +import org.jboss.bpm.console.client.model.ProcessDefinitionRef; import org.jboss.bpm.console.server.gson.GsonFactory; import org.jboss.bpm.console.server.integration.JBPM3Extension; import org.jboss.bpm.console.server.integration.ManagementFactory; @@ -82,6 +83,18 @@ return createJsonResponse(wrapper); } + @GET + @Path("definitions/{name}") + @Produces("application/json") + public Response getDefinitionByName( + @PathParam("name") + String name + ) + { + ProcessDefinitionRef def = getProcessDAO().getDefinition(name); + return createJsonResponse(def); + } + @POST @Path("definitions/{id}/remove") @Produces("application/json") Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java 2008-11-24 10:12:50 UTC (rev 3048) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java 2008-11-24 12:41:33 UTC (rev 3049) @@ -44,4 +44,6 @@ ProcessInstanceRef newInstance(long processId); void signalToken(long tokenId, String signal); + + ProcessDefinitionRef getDefinition(String name); } Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3CommandDelegate.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3CommandDelegate.java 2008-11-24 10:12:50 UTC (rev 3048) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3CommandDelegate.java 2008-11-24 12:41:33 UTC (rev 3049) @@ -28,6 +28,7 @@ import org.jbpm.ejb.LocalCommandService; import org.jbpm.ejb.LocalCommandServiceHome; import org.jbpm.graph.def.ProcessDefinition; +import org.jbpm.graph.exe.ProcessInstance; import org.jbpm.taskmgmt.exe.TaskInstance; import javax.ejb.CreateException; @@ -80,17 +81,24 @@ public List<ProcessDefinition> getActualDefinitions() { - List<org.jbpm.graph.def.ProcessDefinition> defs = (List<org.jbpm.graph.def.ProcessDefinition>) + List<ProcessDefinition> defs = (List<ProcessDefinition>) facade.execute( new GetProcessDefinitionsCommand(false) ); return defs; } - public org.jbpm.graph.def.ProcessDefinition getActualDefinition(long processId) + public ProcessDefinition getActualDefinition(String name) { - List<org.jbpm.graph.def.ProcessDefinition> defs = getActualDefinitions(); + ProcessDefinition def = (ProcessDefinition) + facade.execute( new GetProcessDefinitionCommand(name) ); + return def; + } - org.jbpm.graph.def.ProcessDefinition match = null; - for(org.jbpm.graph.def.ProcessDefinition p0 : defs) + public ProcessDefinition getActualDefinition(long processId) + { + List<ProcessDefinition> defs = getActualDefinitions(); + + ProcessDefinition match = null; + for(ProcessDefinition p0 : defs) { if(processId == p0.getId()) { @@ -107,33 +115,33 @@ public void removeActualDefinition(long processId) { - org.jbpm.graph.def.ProcessDefinition def = getActualDefinition(processId); + 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) + ProcessInstance instance = (ProcessInstance) facade.execute( new GetProcessInstanceCommand(instanceId)); return instance; } - public List<org.jbpm.graph.exe.ProcessInstance> getActualInstances(long processId) + public List<ProcessInstance> getActualInstances(long processId) { - org.jbpm.graph.def.ProcessDefinition p0 = getActualDefinition(processId); + ProcessDefinition p0 = getActualDefinition(processId); GetProcessInstancesCommand command = new GetProcessInstancesCommand(); command.setProcessId(processId); - List<org.jbpm.graph.exe.ProcessInstance> instances = - (List<org.jbpm.graph.exe.ProcessInstance>) facade.execute(command); + List<ProcessInstance> instances = + (List<ProcessInstance>) facade.execute(command); return instances; } - public org.jbpm.graph.exe.ProcessInstance startNewInstance(long processId) + public ProcessInstance startNewInstance(long processId) { - org.jbpm.graph.def.ProcessDefinition p0 = getActualDefinition(processId); - org.jbpm.graph.exe.ProcessInstance instance = (org.jbpm.graph.exe.ProcessInstance) + ProcessDefinition p0 = getActualDefinition(processId); + ProcessInstance instance = (ProcessInstance) facade.execute(new NewProcessInstanceCommand(p0.getName())); return instance; @@ -141,7 +149,7 @@ public ProcessDefinition deploy(byte[] data) { - org.jbpm.graph.def.ProcessDefinition p0 = (org.jbpm.graph.def.ProcessDefinition) + ProcessDefinition p0 = (ProcessDefinition) facade.execute( new DeployProcessCommand(data) ); Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ProcessManagement.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ProcessManagement.java 2008-11-24 10:12:50 UTC (rev 3048) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ProcessManagement.java 2008-11-24 12:41:33 UTC (rev 3049) @@ -60,6 +60,13 @@ return Transform.processDefinition(p0); } + + public ProcessDefinitionRef getDefinition(String name) + { + ProcessDefinition p0 = delegate.getActualDefinition(name); + return Transform.processDefinition(p0); + } + public List<ProcessDefinitionRef> removeDefinition(long processId) { delegate.removeActualDefinition(processId); Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2008-11-24 10:12:50 UTC (rev 3048) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2008-11-24 12:41:33 UTC (rev 3049) @@ -157,4 +157,8 @@ return getBaseUrl() + "/rs/identity/user/"+actorId+"/actors"; } + public String getProcessDefinitionByNameURL(String name) + { + return getBaseUrl() + "/rs/process/definitions/"+name; + } } Modified: projects/gwt-console/trunk/war/src/test/java/PreparationTest.java =================================================================== --- projects/gwt-console/trunk/war/src/test/java/PreparationTest.java 2008-11-24 10:12:50 UTC (rev 3048) +++ projects/gwt-console/trunk/war/src/test/java/PreparationTest.java 2008-11-24 12:41:33 UTC (rev 3049) @@ -22,15 +22,13 @@ import junit.framework.Assert; import junit.framework.TestCase; +import org.jboss.bpm.console.client.URLBuilder; import java.io.*; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; -import org.jboss.bpm.console.client.URLBuilder; -import org.jboss.bpm.console.client.GwtTestApplication; - /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; */ Modified: projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestApplication.java =================================================================== --- projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestApplication.java 2008-11-24 10:12:50 UTC (rev 3048) +++ projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestApplication.java 2008-11-24 12:41:33 UTC (rev 3049) @@ -25,6 +25,9 @@ import com.google.gwt.http.client.Response; import com.google.gwt.junit.client.GWTTestCase; import com.google.gwt.user.client.Timer; +import com.gwtext.client.widgets.ComponentMgr; +import org.jboss.bpm.console.client.process.ProcessDefinitionList; +import org.jboss.bpm.console.client.process.ProcessDefinitionListEditor; /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; @@ -38,7 +41,6 @@ return "org.jboss.bpm.console.Application"; } - protected void gwtSetUp() throws Exception { super.gwtSetUp(); @@ -87,11 +89,14 @@ delayTestFinish(500); } - /*public void testProcessDefList() + public void testProcessDefList() { final MainView view = application.getConsoleView(); assertNotNull("View not initialized", view); + URLBuilder urlBuilder = new URLBuilder("http://localhost:8080", "gwt-console-server"); + final String url = urlBuilder.getProcessDefinitionByNameURL("simple"); + Timer verification = new Timer(){ public void run() @@ -140,6 +145,6 @@ loading.schedule(1000); verification.schedule(1500); - delayTestFinish(2000); - }*/ + delayTestFinish(2000); + } }