[jbpm-commits] JBoss JBPM SVN: r4354 - in jbpm4/branches/tbaeyens/modules: deployment/src/test/java/org/jbpm/deploy/test and 17 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-03-30 05:13:39 -0400 (Mon, 30 Mar 2009) New Revision: 4354 Removed: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ProcessServiceImpl.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessServiceBinding.java Modified: jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/ProcessEngine.java jbpm4/branches/tbaeyens/modules/deployment/src/test/java/org/jbpm/deploy/test/JbpmTestCase.java jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part1.jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/part1.jbpm.wire.bindings.xml jbpm4/branches/tbaeyens/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java jbpm4/branches/tbaeyens/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java jbpm4/branches/tbaeyens/modules/enterprise/src/test/java/org/jbpm/test/deployer/DeployerTestServlet.java jbpm4/branches/tbaeyens/modules/examples/src/test/java/org/jbpm/examples/services/ProcessEngineTest.java jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.execution.hbm.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.wire.bindings.xml jbpm4/branches/tbaeyens/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java jbpm4/branches/tbaeyens/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java jbpm4/branches/tbaeyens/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.wire.bindings.xml jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/cfg/ConfigurationTest.java jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/process/DeploymentResourcesTest.java jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.execution.hbm.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.wire.bindings.xml Log: replaced process service with repository service Modified: jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/ProcessEngine.java =================================================================== --- jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/ProcessEngine.java 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/ProcessEngine.java 2009-03-30 09:13:39 UTC (rev 4354) @@ -29,11 +29,6 @@ */ public interface ProcessEngine { - /** the {@link ProcessService process service} that provides access - * to the process repository. - * @deprecated */ - ProcessService getProcessService(); - /** the {@link RepositoryService repository service} that provides access * to the process repository. */ RepositoryService getRepositoryService(); Modified: jbpm4/branches/tbaeyens/modules/deployment/src/test/java/org/jbpm/deploy/test/JbpmTestCase.java =================================================================== --- jbpm4/branches/tbaeyens/modules/deployment/src/test/java/org/jbpm/deploy/test/JbpmTestCase.java 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/deployment/src/test/java/org/jbpm/deploy/test/JbpmTestCase.java 2009-03-30 09:13:39 UTC (rev 4354) @@ -72,7 +72,6 @@ protected static ProcessEngine processEngine = null; protected static RepositoryService repositoryService; - protected static ProcessService processService; protected static ExecutionService executionService; protected static ManagementService managementService; protected static TaskService taskService; @@ -107,7 +106,6 @@ processEngine = configuration.buildProcessEngine(); repositoryService = processEngine.get(RepositoryService.class); - processService = processEngine.getProcessService(); executionService = processEngine.getExecutionService(); historyService = processEngine.getHistoryService(); managementService = processEngine.getManagementService(); Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part1.jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part1.jbpm.cfg.xml 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part1.jbpm.cfg.xml 2009-03-30 09:13:39 UTC (rev 4354) @@ -6,7 +6,6 @@ <repository-service /> <repository-cache /> - <process-service /> <execution-service /> <history-service /> <management-service /> Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/part1.jbpm.wire.bindings.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/part1.jbpm.wire.bindings.xml 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/part1.jbpm.wire.bindings.xml 2009-03-30 09:13:39 UTC (rev 4354) @@ -61,7 +61,6 @@ <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> <!-- services --> <binding class="org.jbpm.pvm.internal.wire.binding.CommandServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ProcessServiceBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" /> Modified: jbpm4/branches/tbaeyens/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java =================================================================== --- jbpm4/branches/tbaeyens/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java 2009-03-30 09:13:39 UTC (rev 4354) @@ -28,7 +28,7 @@ import junit.framework.Test; import org.jbpm.ExecutionService; -import org.jbpm.ProcessService; +import org.jbpm.RepositoryService; import org.jbpm.client.ClientProcessDefinition; import org.jbpm.cmd.Command; import org.jbpm.cmd.CommandService; @@ -82,7 +82,7 @@ .endProcess(); // deploy process - environment.get(ProcessService.class) + environment.get(RepositoryService.class) .createDeployment() .addProcessDefinition(processDefinition) .deploy(); Modified: jbpm4/branches/tbaeyens/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java =================================================================== --- jbpm4/branches/tbaeyens/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java 2009-03-30 09:13:39 UTC (rev 4354) @@ -31,6 +31,7 @@ import org.jbpm.Execution; import org.jbpm.ExecutionService; import org.jbpm.ProcessService; +import org.jbpm.RepositoryService; import org.jbpm.client.ClientProcessDefinition; import org.jbpm.cmd.Command; import org.jbpm.cmd.CommandService; @@ -130,7 +131,7 @@ public void testHappyTimer() throws CreateException { // deploy process listenerDescriptor.setClassName(HappyListener.class.getName()); - environment.get(ProcessService.class) + environment.get(RepositoryService.class) .createDeployment() .addProcessDefinition(processDefinition) .deploy(); @@ -175,7 +176,7 @@ public void testNoisyTimer() throws CreateException { // deploy process listenerDescriptor.setClassName(NoisyListener.class.getName()); - environment.get(ProcessService.class) + environment.get(RepositoryService.class) .createDeployment() .addProcessDefinition(processDefinition) .deploy(); @@ -228,7 +229,7 @@ public void testCyclicTimer() throws CreateException { // deploy process listenerDescriptor.setClassName(HappyListener.class.getName()); - environment.get(ProcessService.class) + environment.get(RepositoryService.class) .createDeployment() .addProcessDefinition(processDefinition) .deploy(); Modified: jbpm4/branches/tbaeyens/modules/enterprise/src/test/java/org/jbpm/test/deployer/DeployerTestServlet.java =================================================================== --- jbpm4/branches/tbaeyens/modules/enterprise/src/test/java/org/jbpm/test/deployer/DeployerTestServlet.java 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/enterprise/src/test/java/org/jbpm/test/deployer/DeployerTestServlet.java 2009-03-30 09:13:39 UTC (rev 4354) @@ -21,9 +21,11 @@ */ package org.jbpm.test.deployer; +import org.jbpm.ProcessDefinitionQuery; import org.jbpm.ProcessEngine; import org.jbpm.ProcessService; import org.jbpm.ProcessDefinition; +import org.jbpm.RepositoryService; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -56,10 +58,12 @@ tx.begin(); ProcessEngine processEngine = (ProcessEngine)ctx.lookup("java:/ProcessEngine"); - ProcessService processService = processEngine.getProcessService(); + RepositoryService repositoryService = processEngine.getRepositoryService(); - ProcessDefinition def = - processService.findLatestProcessDefinitionByKey(JBPM_DEPLOYER_TEST_V5); + ProcessDefinition def = repositoryService.createProcessDefinitionQuery() + .key(JBPM_DEPLOYER_TEST_V5) + .orderDesc(ProcessDefinitionQuery.PROPERTY_VERSION) + .uniqueResult(); tx.commit(); Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/java/org/jbpm/examples/services/ProcessEngineTest.java =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/java/org/jbpm/examples/services/ProcessEngineTest.java 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/java/org/jbpm/examples/services/ProcessEngineTest.java 2009-03-30 09:13:39 UTC (rev 4354) @@ -1,51 +1,42 @@ package org.jbpm.examples.services; +import junit.framework.TestCase; + import org.jbpm.Configuration; -import org.jbpm.Deployment; -import org.jbpm.Execution; import org.jbpm.ExecutionService; +import org.jbpm.HistoryService; +import org.jbpm.ManagementService; import org.jbpm.ProcessEngine; -import org.jbpm.ProcessService; -import org.jbpm.test.BaseJbpmTestCase; +import org.jbpm.RepositoryService; +import org.jbpm.TaskService; -/** example on how to create process engine objects starting from a configuration +/** shows explicitely the part of the API that is + * provided by JbpmTestCase as a convenience. * - * @author Koen Aers + * @author Koen Aers, Tom Baeyens */ -public class ProcessEngineTest extends BaseJbpmTestCase { +public class ProcessEngineTest extends TestCase { - /** creation of a process engine with the default configuration */ - public void testDefaultProcessEngine() { + public void testBasicApiUsage() { + // create a configuration Configuration configuration = new Configuration(); + // build a process engine from a configuration ProcessEngine processEngine = configuration.buildProcessEngine(); - ProcessService processService = processEngine.getProcessService(); + + // Obtain the services from the process engine + // ProcessEngine and Services are to be used as singletons. (ie they are threadsafe) + RepositoryService repositoryService = processEngine.getRepositoryService(); ExecutionService executionService = processEngine.getExecutionService(); + TaskService taskService = processEngine.getTaskService(); + HistoryService historyService = processEngine.getHistoryService(); + ManagementService managementService = processEngine.getManagementService(); - Deployment deployment = processService.createDeployment(); - deployment.addResourceFromClasspath("org/jbpm/examples/services/process.jpdl.xml"); - deployment.deploy(); - - Execution processInstance = executionService.startProcessInstanceByKey("simple"); - executionService.signalExecutionById(processInstance.getId()); - assertEquals("state", processInstance.getActivityName()); - - } + // Deploying a process + long deploymentDbid = repositoryService.createDeployment() + .addResourceFromClasspath("org/jbpm/examples/services/process.jpdl.xml") + .deploy(); - /** creation of a process engine with a custom configuration */ - public void testCustomProcessEngineCreation() { - Configuration configuration = new Configuration().setXmlString( - "<jbpm-configuration>" + - " <process-engine-context>" + - " <process-service />" + - " </process-engine-context>" + - "</jbpm-configuration>"); - ProcessEngine processEngine = configuration.buildProcessEngine(); - - // All services but the process service are created with the above configuration - assertNotNull(processEngine); - assertNotNull(processEngine.getProcessService()); - assertNull(processEngine.getTaskService()); + repositoryService.deleteDeployment(deploymentDbid); } - } Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml 2009-03-30 09:13:39 UTC (rev 4354) @@ -6,7 +6,6 @@ <repository-service /> <repository-cache /> - <process-service /> <execution-service /> <history-service /> <management-service /> Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.execution.hbm.xml 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.execution.hbm.xml 2009-03-30 09:13:39 UTC (rev 4354) @@ -348,22 +348,4 @@ ]]> </query> - <!-- query name="findExecutionByKey"> - <![CDATA[ - select execution - from org.jbpm.pvm.internal.model.ExecutionImpl as execution - where execution.key = :executionKey - and execution.processDefinition.name = :processDefinitionName - ]]> - </query --> - - <query name="findProcessInstanceIds"> - <![CDATA[ - select processInstance.id - from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance - where processInstance.processDefinitionId = :processDefinitionId - and processInstance.parent is null - ]]> - </query> - </hibernate-mapping> \ No newline at end of file Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.wire.bindings.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.wire.bindings.xml 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.wire.bindings.xml 2009-03-30 09:13:39 UTC (rev 4354) @@ -61,7 +61,6 @@ <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> <!-- services --> <binding class="org.jbpm.pvm.internal.wire.binding.CommandServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ProcessServiceBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" /> Modified: jbpm4/branches/tbaeyens/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java =================================================================== --- jbpm4/branches/tbaeyens/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-03-30 09:13:39 UTC (rev 4354) @@ -21,35 +21,34 @@ */ package org.jbpm.integration.console; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.List; + import org.jboss.bpm.console.client.model.ProcessDefinitionRef; import org.jboss.bpm.console.client.model.ProcessInstanceRef; import org.jboss.bpm.console.client.model.TaskRef; import org.jboss.bpm.console.client.model.jbpm3.TokenReference; - +import org.jbpm.ProcessDefinition; import org.jbpm.model.OpenExecution; -import org.jbpm.model.OpenProcessDefinition; import org.jbpm.model.Transition; -import org.jbpm.task.Task; -import org.jbpm.pvm.internal.task.TaskImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.pvm.internal.task.TaskImpl; +import org.jbpm.task.Task; -import java.util.Date; -import java.util.List; -import java.util.ArrayList; -import java.util.Collection; - /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; */ public class ModelAdaptor { - public static ProcessDefinitionRef adoptDefinition(OpenProcessDefinition p0) + public static ProcessDefinitionRef adoptDefinition(ProcessDefinition processDefinition) { ProcessDefinitionRef def = new ProcessDefinitionRef(); - def.setId( p0.getId() ); - def.setName(p0.getName()); - def.setVersion(p0.getVersion()); - def.setKey( p0.getKey() ); + def.setId( processDefinition.getId() ); + def.setName(processDefinition.getName()); + def.setVersion(processDefinition.getVersion()); + def.setKey( processDefinition.getKey() ); // def.setDescription(p0.getDescription()); // def.setPackageName(p0.getPackageName()); Modified: jbpm4/branches/tbaeyens/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java =================================================================== --- jbpm4/branches/tbaeyens/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java 2009-03-30 09:13:39 UTC (rev 4354) @@ -21,19 +21,23 @@ */ package org.jbpm.integration.console; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; + import org.jboss.bpm.console.client.model.ProcessDefinitionRef; import org.jboss.bpm.console.client.model.ProcessInstanceRef; import org.jboss.bpm.console.server.integration.ProcessManagement; -import org.jbpm.*; +import org.jbpm.Execution; +import org.jbpm.ExecutionQuery; +import org.jbpm.ExecutionService; +import org.jbpm.ProcessDefinition; +import org.jbpm.ProcessDefinitionQuery; +import org.jbpm.ProcessService; +import org.jbpm.RepositoryService; import org.jbpm.model.OpenExecution; import org.jbpm.model.OpenProcessDefinition; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; */ @@ -44,20 +48,15 @@ { List<ProcessDefinitionRef> results = new ArrayList<ProcessDefinitionRef>(); - ProcessService processService = this.processEngine.getProcessService(); - List<String> keys = processService.findProcessDefinitionKeys(); - Set<ProcessDefinition> definitions = new HashSet<ProcessDefinition>(); - for(String key : keys) - { - definitions.addAll( - processService.findProcessDefinitionsByKey(key) - ); - } - + RepositoryService repositoryService = this.processEngine.getRepositoryService(); + List<ProcessDefinition> definitions = repositoryService.createProcessDefinitionQuery() + .orderAsc(ProcessDefinitionQuery.PROPERTY_NAME) + .execute(); + // adopt ProcessDefinition to console model - for(ProcessDefinition p0 : definitions) + for(ProcessDefinition processDefinition : definitions) { - results.add( ModelAdaptor.adoptDefinition((OpenProcessDefinition)p0) ); + results.add( ModelAdaptor.adoptDefinition(processDefinition) ); } return results; @@ -66,15 +65,22 @@ public ProcessDefinitionRef getProcessDefinition(String procDefId) { - ProcessService processService = this.processEngine.getProcessService(); - ProcessDefinition p0 = processService.findProcessDefinitionById(procDefId); - return ModelAdaptor.adoptDefinition((OpenProcessDefinition)p0); + RepositoryService repositoryService = this.processEngine.getRepositoryService(); + ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery() + .id(procDefId) + .uniqueResult(); + return ModelAdaptor.adoptDefinition(processDefinition); } public List<ProcessDefinitionRef> removeProcessDefinition(String procDefId) { - ProcessService processService = this.processEngine.getProcessService(); - processService.deleteProcessDefinitionCascade(procDefId); + RepositoryService repositoryService = this.processEngine.getRepositoryService(); + ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery() + .id(procDefId) + .uniqueResult(); + if (processDefinition!=null) { + repositoryService.deleteDeploymentCascade(processDefinition.getDeploymentDbid()); + } return getProcessDefinitions(); } @@ -162,11 +168,10 @@ public void deploy(String fileName, String contentType, InputStream deployment) { - this.processEngine.getProcessService() + this.processEngine.getRepositoryService() .createDeployment() .addResourceFromInputStream(fileName, deployment) .deploy(); - } } Modified: jbpm4/branches/tbaeyens/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java =================================================================== --- jbpm4/branches/tbaeyens/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java 2009-03-30 09:13:39 UTC (rev 4354) @@ -28,7 +28,6 @@ import javax.transaction.SystemException; import javax.transaction.UserTransaction; -import org.jbpm.ProcessService; import org.jbpm.RepositoryService; import org.jbpm.internal.log.Log; @@ -55,11 +54,11 @@ tx.begin(); // deploy to process engine - ProcessService processService = jbpmService.getProcessEngine().getProcessService(); + RepositoryService repositoryService = jbpmService.getProcessEngine().getRepositoryService(); String deploymentName = deploymentMetData.getWatch().getPath(); File deploymentFile = new File(deploymentName); - long deploymentDbid = processService.createDeployment() + long deploymentDbid = repositoryService.createDeployment() .addResourceFromUrl(deploymentMetData.getProcessDescriptor()) .setTimestamp(deploymentFile.lastModified()) .setName(deploymentName) Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-03-30 09:13:39 UTC (rev 4354) @@ -6,7 +6,6 @@ <repository-service /> <repository-cache /> - <process-service /> <execution-service /> <history-service /> <management-service /> Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml 2009-03-30 09:13:39 UTC (rev 4354) @@ -348,22 +348,4 @@ ]]> </query> - <!-- query name="findExecutionByKey"> - <![CDATA[ - select execution - from org.jbpm.pvm.internal.model.ExecutionImpl as execution - where execution.key = :executionKey - and execution.processDefinition.name = :processDefinitionName - ]]> - </query --> - - <query name="findProcessInstanceIds"> - <![CDATA[ - select processInstance.id - from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance - where processInstance.processDefinitionId = :processDefinitionId - and processInstance.parent is null - ]]> - </query> - </hibernate-mapping> \ No newline at end of file Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml 2009-03-30 09:13:39 UTC (rev 4354) @@ -61,7 +61,6 @@ <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> <!-- services --> <binding class="org.jbpm.pvm.internal.wire.binding.CommandServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ProcessServiceBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" /> Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-03-30 09:13:39 UTC (rev 4354) @@ -154,9 +154,6 @@ public ManagementService getManagementService() { return environmentFactoryCtxWireContext.get(ManagementService.class); } - public ProcessService getProcessService() { - return environmentFactoryCtxWireContext.get(ProcessService.class); - } public TaskService getTaskService() { return environmentFactoryCtxWireContext.get(TaskService.class); } Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ProcessServiceImpl.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ProcessServiceImpl.java 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/ProcessServiceImpl.java 2009-03-30 09:13:39 UTC (rev 4354) @@ -1,83 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbpm.pvm.internal.svc; - -import java.util.List; - -import org.jbpm.Deployment; -import org.jbpm.ProcessDefinition; -import org.jbpm.ProcessDefinitionQuery; -import org.jbpm.ProcessService; -import org.jbpm.cmd.CommandService; -import org.jbpm.pvm.internal.cmd.DeleteProcessDefinitionCmd; -import org.jbpm.pvm.internal.cmd.DeployCmd; -import org.jbpm.pvm.internal.cmd.FindLatestProcessDefinitionByKeyCmd; -import org.jbpm.pvm.internal.cmd.FindProcessDefinitionByIdCmd; -import org.jbpm.pvm.internal.cmd.FindProcessDefinitionKeysCmd; -import org.jbpm.pvm.internal.cmd.FindProcessDefinitionsByKeyCmd; -import org.jbpm.pvm.internal.cmd.GetResourceAsStreamCmd; -import org.jbpm.pvm.internal.query.ProcessDefinitionQueryImpl; -import org.jbpm.pvm.internal.repository.DeploymentImpl; - -/** {@link ProcessService} implementation that delegates execution of the - * methods to a {@link CommandService}. - * - * @author Tom Baeyens - */ -public class ProcessServiceImpl extends AbstractServiceImpl implements ProcessService { - - public Deployment createDeployment() { - return new DeploymentImpl(commandService); - } - - public List<String> findProcessDefinitionKeys() { - return commandService.execute(new FindProcessDefinitionKeysCmd()); - } - - public ProcessDefinition findLatestProcessDefinitionByKey(String processDefinitionKey) { - return commandService.execute(new FindLatestProcessDefinitionByKeyCmd(processDefinitionKey)); - } - - public List<ProcessDefinition> findProcessDefinitionsByKey(String processDefinitionName) { - return (List)commandService.execute(new FindProcessDefinitionsByKeyCmd(processDefinitionName)); - } - - public ProcessDefinition findProcessDefinitionById(String processDefinitionId) { - return commandService.execute(new FindProcessDefinitionByIdCmd(processDefinitionId)); - } - - public void deleteProcessDefinition(String processDefinitionId) { - commandService.execute(new DeleteProcessDefinitionCmd(processDefinitionId)); - } - - public void deleteProcessDefinitionCascade(String processDefinitionId) { - commandService.execute(new DeleteProcessDefinitionCmd(processDefinitionId, true, true)); - } - - public ProcessDefinitionQuery createProcessDefinitionQuery() { - return new ProcessDefinitionQueryImpl(commandService); - } - - public Long deploy(Deployment deployment) { - return commandService.execute(new DeployCmd((DeploymentImpl)deployment)); - } -} Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessServiceBinding.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessServiceBinding.java 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessServiceBinding.java 2009-03-30 09:13:39 UTC (rev 4354) @@ -1,47 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbpm.pvm.internal.wire.binding; - -import org.jbpm.cmd.CommandService; -import org.jbpm.pvm.internal.svc.ProcessServiceImpl; -import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor; -import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; -import org.jbpm.pvm.internal.xml.Parse; -import org.jbpm.pvm.internal.xml.Parser; -import org.w3c.dom.Element; - - -/** - * @author Tom Baeyens - */ -public class ProcessServiceBinding extends WireDescriptorBinding { - - public ProcessServiceBinding() { - super("process-service"); - } - - public Object parse(Element element, Parse parse, Parser parser) { - ObjectDescriptor descriptor = new ObjectDescriptor(ProcessServiceImpl.class); - descriptor.addInjection("commandService", new ContextTypeRefDescriptor(CommandService.class)); - return descriptor; - } -} Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-03-30 09:13:39 UTC (rev 4354) @@ -6,7 +6,6 @@ <repository-service /> <repository-cache /> - <process-service /> <execution-service /> <history-service /> <management-service /> Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml 2009-03-30 09:13:39 UTC (rev 4354) @@ -348,22 +348,4 @@ ]]> </query> - <!-- query name="findExecutionByKey"> - <![CDATA[ - select execution - from org.jbpm.pvm.internal.model.ExecutionImpl as execution - where execution.key = :executionKey - and execution.processDefinition.name = :processDefinitionName - ]]> - </query --> - - <query name="findProcessInstanceIds"> - <![CDATA[ - select processInstance.id - from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance - where processInstance.processDefinitionId = :processDefinitionId - and processInstance.parent is null - ]]> - </query> - </hibernate-mapping> \ No newline at end of file Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.wire.bindings.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.wire.bindings.xml 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.wire.bindings.xml 2009-03-30 09:13:39 UTC (rev 4354) @@ -61,7 +61,6 @@ <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> <!-- services --> <binding class="org.jbpm.pvm.internal.wire.binding.CommandServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ProcessServiceBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" /> Modified: jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java =================================================================== --- jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-03-30 09:13:39 UTC (rev 4354) @@ -69,7 +69,6 @@ protected static ProcessEngine processEngine = null; protected static RepositoryService repositoryService; - protected static ProcessService processService; protected static ExecutionService executionService; protected static ManagementService managementService; protected static TaskService taskService; @@ -104,7 +103,6 @@ processEngine = configuration.buildProcessEngine(); repositoryService = processEngine.get(RepositoryService.class); - processService = processEngine.getProcessService(); executionService = processEngine.getExecutionService(); historyService = processEngine.getHistoryService(); managementService = processEngine.getManagementService(); Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/cfg/ConfigurationTest.java =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/cfg/ConfigurationTest.java 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/cfg/ConfigurationTest.java 2009-03-30 09:13:39 UTC (rev 4354) @@ -48,7 +48,7 @@ .setXmlString( "<jbpm-configuration>" + " <process-engine-context>" + - " <process-service />" + + " <repository-service />" + " <execution-service />" + " <management-service />" + " </process-engine-context>" + @@ -56,7 +56,6 @@ ) .buildProcessEngine(); assertNotNull(processEngine); - assertNotNull(processEngine.getProcessService()); assertNotNull(processEngine.getExecutionService()); assertNotNull(processEngine.getManagementService()); } Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/process/DeploymentResourcesTest.java =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/process/DeploymentResourcesTest.java 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/process/DeploymentResourcesTest.java 2009-03-30 09:13:39 UTC (rev 4354) @@ -42,7 +42,7 @@ byte[] otherBytes = generateString("other bytes ", 5000).getBytes(); long deploymentDbid = - processService.createDeployment() + repositoryService.createDeployment() .addResourceFromString("xmlstring.jpdl.xml", "<process name='Insurance claim'>" + " <start />" + Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java 2009-03-30 09:13:39 UTC (rev 4354) @@ -34,7 +34,7 @@ public class ProcessDefinitionQueryTest extends JbpmTestCase { public void testQueryProcessDefinitionsEmpty() { - List<ProcessDefinition> processDefinitions = processService + List<ProcessDefinition> processDefinitions = repositoryService .createProcessDefinitionQuery() .execute(); Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml 2009-03-30 09:13:39 UTC (rev 4354) @@ -6,7 +6,6 @@ <repository-service /> <repository-cache /> - <process-service /> <execution-service /> <history-service /> <management-service /> Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.execution.hbm.xml 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.execution.hbm.xml 2009-03-30 09:13:39 UTC (rev 4354) @@ -348,22 +348,4 @@ ]]> </query> - <!-- query name="findExecutionByKey"> - <![CDATA[ - select execution - from org.jbpm.pvm.internal.model.ExecutionImpl as execution - where execution.key = :executionKey - and execution.processDefinition.name = :processDefinitionName - ]]> - </query --> - - <query name="findProcessInstanceIds"> - <![CDATA[ - select processInstance.id - from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance - where processInstance.processDefinitionId = :processDefinitionId - and processInstance.parent is null - ]]> - </query> - </hibernate-mapping> \ No newline at end of file Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.wire.bindings.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.wire.bindings.xml 2009-03-30 07:35:41 UTC (rev 4353) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.wire.bindings.xml 2009-03-30 09:13:39 UTC (rev 4354) @@ -61,7 +61,6 @@ <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> <!-- services --> <binding class="org.jbpm.pvm.internal.wire.binding.CommandServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ProcessServiceBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" />