Author: thomas.diesler(a)jboss.com Date: 2008-10-29 10:37:50 -0400 (Wed, 29 Oct 2008) New Revision: 2659 Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/APITestSetup.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java Removed: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestProcessCatalog.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestSetup.java Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/config/internal/EmbeddedBeansDeployer.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ConfigurationTestSetup.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestSetup.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessBuilderTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java projects/spec/trunk/modules/samples/airticket/client/pom.xml projects/spec/trunk/pom.xml Log: Airticket GWT sample ok Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/config/internal/EmbeddedBeansDeployer.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/config/internal/EmbeddedBeansDeployer.java 2008-10-29 14:14:52 UTC (rev 2658) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/config/internal/EmbeddedBeansDeployer.java 2008-10-29 14:37:50 UTC (rev 2659) @@ -29,7 +29,6 @@ import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap; import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer; import org.jboss.kernel.plugins.util.KernelLocator; -import org.jbpm.api.test.CTSTestSetup; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,7 +41,7 @@ public class EmbeddedBeansDeployer extends BasicBootstrap { // Provide logging - final Logger log = LoggerFactory.getLogger(CTSTestSetup.class); + final Logger log = LoggerFactory.getLogger(EmbeddedBeansDeployer.class); private Kernel kernel; private BasicXMLDeployer deployer; Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/APITestSetup.java (from rev 2649, projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestSetup.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/APITestSetup.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/APITestSetup.java 2008-10-29 14:37:50 UTC (rev 2659) @@ -0,0 +1,60 @@ +/* + * 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.api.test; + +import junit.extensions.TestSetup; +import junit.framework.TestSuite; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * An API test setup + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Sep-2008 + */ +public class APITestSetup extends TestSetup +{ + // Provide logging + final Logger log = LoggerFactory.getLogger(APITestSetup.class); + + public APITestSetup(Class<?> testCase) + { + super(new TestSuite(testCase)); + } + + @Override + protected void setUp() throws Exception + { + log.debug("### START SETUP " + getTest()); + super.setUp(); + } + + @Override + protected void tearDown() throws Exception + { + super.tearDown(); + log.debug("### END SETUP " + getTest()); + } + +} Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestProcessCatalog.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestProcessCatalog.java 2008-10-29 14:14:52 UTC (rev 2658) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestProcessCatalog.java 2008-10-29 14:37:50 UTC (rev 2659) @@ -1,108 +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.api.test; - -// $Id$ - -import junit.framework.TestCase; - -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.Assignment; -import org.jbpm.api.model.EndEvent; -import org.jbpm.api.model.Expression; -import org.jbpm.api.model.Message; -import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.StartEvent; -import org.jbpm.api.model.Task; -import org.jbpm.api.model.Assignment.AssignTime; -import org.jbpm.api.model.builder.ProcessBuilder; -import org.jbpm.api.service.ProcessBuilderService; - -/** - * A catalog of CTS test processes - * - * @author thomas.diesler(a)jboss.com - * @since 24-Sep-2008 - */ -public abstract class CTSTestProcessCatalog -{ - public static ProcessDefinition getDefaultProcess(ProcessEngine engine) - { - ProcessBuilder builder = engine.getService(ProcessBuilderService.class).getProcessBuilder(); - builder.addProcess("Proc"); - builder.addProcessProperty("proP1", "valP1").addProcessProperty("proP2", "valP2"); - builder.addProcessMessage("procMsg").addProperty("msgPropName", "msgPropVal"); - builder.addProcessAssignment(AssignTime.Start, Expression.ExpressionLanguage.MVEL, "foo==true", "fooTrue"); - builder.addStartEvent("Start").addSequenceFlow("Task"); - builder.addTask("Task").addNodeProperty("proT1", "valT1").addNodeProperty("proT2", "valT2"); - builder.addSequenceFlow("End").addEndEvent("End"); - return builder.getProcessDefinition(); - } - - public static void validateDefaultProcess(ProcessDefinition procDef) - { - TestCase.assertNotNull("Process not null", procDef); - TestCase.assertEquals("Proc", procDef.getName()); - - TestCase.assertEquals("Two proc props", 2, procDef.getPropertyNames().size()); - TestCase.assertEquals("valP1", procDef.getProperty("proP1").getValue()); - TestCase.assertEquals("valP2", procDef.getProperty("proP2").getValue()); - - Message procMsg = procDef.getMessage("procMsg"); - TestCase.assertEquals("One proc message", 1, procDef.getMessages().size()); - TestCase.assertEquals("msgPropVal", procMsg.getProperty("msgPropName").getValue()); - - TestCase.assertEquals("One proc assignment", 1, procDef.getAssignments().size()); - Assignment procAssign = procDef.getAssignments().get(0); - TestCase.assertEquals(AssignTime.Start, procAssign.getAssignTime()); - TestCase.assertEquals("foo==true", procAssign.getFrom().getExpressionBody()); - TestCase.assertEquals("fooTrue", procAssign.getTo().getName()); - - StartEvent start = (StartEvent)procDef.getNode("Start"); - Task task = (Task)procDef.getNode("Task"); - EndEvent end = (EndEvent)procDef.getNode("End"); - - TestCase.assertNotNull("Start not null", start); - TestCase.assertNotNull("Task not null", task); - TestCase.assertNotNull("End not null", end); - - TestCase.assertEquals("No start props", 0, start.getPropertyNames().size()); - TestCase.assertEquals("Two task props", 2, task.getPropertyNames().size()); - TestCase.assertEquals("No end props", 0, end.getPropertyNames().size()); - - TestCase.assertEquals("valT1", task.getProperty("proT1").getValue()); - TestCase.assertEquals("valT2", task.getProperty("proT2").getValue()); - - SequenceFlow startFlow = start.getOutFlow(); - TestCase.assertNotNull("Start flow not null", startFlow); - TestCase.assertEquals("Task", startFlow.getTargetName()); - TestCase.assertSame(start, startFlow.getSourceRef()); - TestCase.assertSame(task, startFlow.getTargetRef()); - - SequenceFlow taskFlow = task.getOutFlow(); - TestCase.assertNotNull("Task flow not null", taskFlow); - TestCase.assertEquals("End", taskFlow.getTargetName()); - TestCase.assertSame(task, taskFlow.getSourceRef()); - TestCase.assertSame(end, taskFlow.getTargetRef()); - } -} Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestSetup.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestSetup.java 2008-10-29 14:14:52 UTC (rev 2658) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestSetup.java 2008-10-29 14:37:50 UTC (rev 2659) @@ -1,60 +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.api.test; - -import junit.extensions.TestSetup; -import junit.framework.TestSuite; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * A CTS test setup - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Sep-2008 - */ -public class CTSTestSetup extends TestSetup -{ - // Provide logging - final Logger log = LoggerFactory.getLogger(CTSTestSetup.class); - - public CTSTestSetup(Class<?> testCase) - { - super(new TestSuite(testCase)); - } - - @Override - protected void setUp() throws Exception - { - log.debug("### START SETUP " + getTest()); - super.setUp(); - } - - @Override - protected void tearDown() throws Exception - { - super.tearDown(); - log.debug("### END SETUP " + getTest()); - } - -} Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ConfigurationTestSetup.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ConfigurationTestSetup.java 2008-10-29 14:14:52 UTC (rev 2658) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ConfigurationTestSetup.java 2008-10-29 14:37:50 UTC (rev 2659) @@ -35,7 +35,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 25-Sep-2008 */ -public class ConfigurationTestSetup extends CTSTestSetup +public class ConfigurationTestSetup extends APITestSetup { public static final String CTS_TEST_ENGINE = "CTSTestEngine"; Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestSetup.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestSetup.java 2008-10-29 14:14:52 UTC (rev 2658) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestSetup.java 2008-10-29 14:37:50 UTC (rev 2659) @@ -37,7 +37,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 14-Oct-2004 */ -public class IntegrationTestSetup extends CTSTestSetup +public class IntegrationTestSetup extends APITestSetup { private IntegrationTestHelper delegate = new IntegrationTestHelper(); private String[] archives = new String[0]; Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java (from rev 2649, projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestProcessCatalog.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java 2008-10-29 14:37:50 UTC (rev 2659) @@ -0,0 +1,108 @@ +/* + * 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.api.test; + +// $Id$ + +import junit.framework.TestCase; + +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.model.Assignment; +import org.jbpm.api.model.EndEvent; +import org.jbpm.api.model.Expression; +import org.jbpm.api.model.Message; +import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.SequenceFlow; +import org.jbpm.api.model.StartEvent; +import org.jbpm.api.model.Task; +import org.jbpm.api.model.Assignment.AssignTime; +import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.api.service.ProcessBuilderService; + +/** + * A catalog of CTS test processes + * + * @author thomas.diesler(a)jboss.com + * @since 24-Sep-2008 + */ +public abstract class ProcessCatalog +{ + public static ProcessDefinition getDefaultProcess(ProcessEngine engine) + { + ProcessBuilder builder = engine.getService(ProcessBuilderService.class).getProcessBuilder(); + builder.addProcess("Proc"); + builder.addProcessProperty("proP1", "valP1").addProcessProperty("proP2", "valP2"); + builder.addProcessMessage("procMsg").addProperty("msgPropName", "msgPropVal"); + builder.addProcessAssignment(AssignTime.Start, Expression.ExpressionLanguage.MVEL, "foo==true", "fooTrue"); + builder.addStartEvent("Start").addSequenceFlow("Task"); + builder.addTask("Task").addNodeProperty("proT1", "valT1").addNodeProperty("proT2", "valT2"); + builder.addSequenceFlow("End").addEndEvent("End"); + return builder.getProcessDefinition(); + } + + public static void validateDefaultProcess(ProcessDefinition procDef) + { + TestCase.assertNotNull("Process not null", procDef); + TestCase.assertEquals("Proc", procDef.getName()); + + TestCase.assertEquals("Two proc props", 2, procDef.getPropertyNames().size()); + TestCase.assertEquals("valP1", procDef.getProperty("proP1").getValue()); + TestCase.assertEquals("valP2", procDef.getProperty("proP2").getValue()); + + Message procMsg = procDef.getMessage("procMsg"); + TestCase.assertEquals("One proc message", 1, procDef.getMessages().size()); + TestCase.assertEquals("msgPropVal", procMsg.getProperty("msgPropName").getValue()); + + TestCase.assertEquals("One proc assignment", 1, procDef.getAssignments().size()); + Assignment procAssign = procDef.getAssignments().get(0); + TestCase.assertEquals(AssignTime.Start, procAssign.getAssignTime()); + TestCase.assertEquals("foo==true", procAssign.getFrom().getExpressionBody()); + TestCase.assertEquals("fooTrue", procAssign.getTo().getName()); + + StartEvent start = (StartEvent)procDef.getNode("Start"); + Task task = (Task)procDef.getNode("Task"); + EndEvent end = (EndEvent)procDef.getNode("End"); + + TestCase.assertNotNull("Start not null", start); + TestCase.assertNotNull("Task not null", task); + TestCase.assertNotNull("End not null", end); + + TestCase.assertEquals("No start props", 0, start.getPropertyNames().size()); + TestCase.assertEquals("Two task props", 2, task.getPropertyNames().size()); + TestCase.assertEquals("No end props", 0, end.getPropertyNames().size()); + + TestCase.assertEquals("valT1", task.getProperty("proT1").getValue()); + TestCase.assertEquals("valT2", task.getProperty("proT2").getValue()); + + SequenceFlow startFlow = start.getOutFlow(); + TestCase.assertNotNull("Start flow not null", startFlow); + TestCase.assertEquals("Task", startFlow.getTargetName()); + TestCase.assertSame(start, startFlow.getSourceRef()); + TestCase.assertSame(task, startFlow.getTargetRef()); + + SequenceFlow taskFlow = task.getOutFlow(); + TestCase.assertNotNull("Task flow not null", taskFlow); + TestCase.assertEquals("End", taskFlow.getTargetName()); + TestCase.assertSame(task, taskFlow.getSourceRef()); + TestCase.assertSame(end, taskFlow.getTargetRef()); + } +} Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessBuilderTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessBuilderTest.java 2008-10-29 14:14:52 UTC (rev 2658) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessBuilderTest.java 2008-10-29 14:37:50 UTC (rev 2659) @@ -28,7 +28,7 @@ import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.api.test.CTSTestProcessCatalog; +import org.jbpm.api.test.ProcessCatalog; /** * Test the ProcessBuilder @@ -40,8 +40,8 @@ { public void testBasicProcess() throws Exception { - ProcessDefinition procDef = CTSTestProcessCatalog.getDefaultProcess(getProcessEngine()); - CTSTestProcessCatalog.validateDefaultProcess(procDef); + ProcessDefinition procDef = ProcessCatalog.getDefaultProcess(getProcessEngine()); + ProcessCatalog.validateDefaultProcess(procDef); } public void testNoProcessName() throws Exception Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-10-29 14:14:52 UTC (rev 2658) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-10-29 14:37:50 UTC (rev 2659) @@ -33,7 +33,7 @@ import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.service.ProcessService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.api.test.CTSTestProcessCatalog; +import org.jbpm.api.test.ProcessCatalog; /** * Test the ProcessDefinition @@ -45,8 +45,8 @@ { public void testBasicProcess() throws Exception { - ProcessDefinition procDef = CTSTestProcessCatalog.getDefaultProcess(getProcessEngine()); - CTSTestProcessCatalog.validateDefaultProcess(procDef); + ProcessDefinition procDef = ProcessCatalog.getDefaultProcess(getProcessEngine()); + ProcessCatalog.validateDefaultProcess(procDef); ProcessEngine engine = procDef.getProcessEngine(); assertNotNull("ProcessEngine not null", engine); @@ -60,7 +60,7 @@ public void testNewInstance() throws Exception { - ProcessDefinition procDef = CTSTestProcessCatalog.getDefaultProcess(getProcessEngine()); + ProcessDefinition procDef = ProcessCatalog.getDefaultProcess(getProcessEngine()); ProcessEngine engine = procDef.getProcessEngine(); ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class); @@ -74,7 +74,7 @@ public void testRegister() throws Exception { - ProcessDefinition procDef = CTSTestProcessCatalog.getDefaultProcess(getProcessEngine()); + ProcessDefinition procDef = ProcessCatalog.getDefaultProcess(getProcessEngine()); ProcessEngine engine = procDef.getProcessEngine(); ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class); Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java 2008-10-29 14:14:52 UTC (rev 2658) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java 2008-10-29 14:37:50 UTC (rev 2659) @@ -33,7 +33,7 @@ import org.jbpm.api.model.Task; import org.jbpm.api.service.PersistenceService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.api.test.CTSTestProcessCatalog; +import org.jbpm.api.test.ProcessCatalog; /** * Test the PersistenceService @@ -52,13 +52,13 @@ PersistenceService service = engine.getService(PersistenceService.class); // Save the ProcessDefinition - ProcessDefinition procDef = CTSTestProcessCatalog.getDefaultProcess(engine); + ProcessDefinition procDef = ProcessCatalog.getDefaultProcess(engine); service.saveProcessDefinition(procDef); // Load the ProcessDefinition ObjectName procDefID = procDef.getKey(); ProcessDefinition loadDef = service.loadProcessDefinition(procDefID); - CTSTestProcessCatalog.validateDefaultProcess(loadDef); + ProcessCatalog.validateDefaultProcess(loadDef); StartEvent start = loadDef.getNode(StartEvent.class, "Start"); Task task = loadDef.getNode(Task.class, "Task"); Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java 2008-10-29 14:14:52 UTC (rev 2658) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java 2008-10-29 14:37:50 UTC (rev 2659) @@ -35,7 +35,7 @@ import org.jbpm.api.service.PersistenceService; import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.test.CTSTestCase; -import org.jbpm.api.test.CTSTestProcessCatalog; +import org.jbpm.api.test.ProcessCatalog; /** * Test the PersistenceService @@ -55,7 +55,7 @@ PersistenceService service = engine.getService(PersistenceService.class); // Register (save) the process definition, which is not done implicitly - ProcessDefinition procDef = unregisterOnTearDown(CTSTestProcessCatalog.getDefaultProcess(engine)); + ProcessDefinition procDef = unregisterOnTearDown(ProcessCatalog.getDefaultProcess(engine)); procDefService.registerProcessDefinition(procDef); // Create and save the Process @@ -65,7 +65,7 @@ // Load the process ObjectName procID = proc.getKey(); Process loadProc = service.loadProcess(procID); - CTSTestProcessCatalog.validateDefaultProcess(loadProc.getProcessDefinition()); + ProcessCatalog.validateDefaultProcess(loadProc.getProcessDefinition()); StartEvent start = loadProc.getNode(StartEvent.class, "Start"); Task task = loadProc.getNode(Task.class, "Task"); Modified: projects/spec/trunk/modules/samples/airticket/client/pom.xml =================================================================== --- projects/spec/trunk/modules/samples/airticket/client/pom.xml 2008-10-29 14:14:52 UTC (rev 2658) +++ projects/spec/trunk/modules/samples/airticket/client/pom.xml 2008-10-29 14:37:50 UTC (rev 2659) @@ -33,6 +33,18 @@ <artifactId>jbpm-spec-sample-airticket-server</artifactId> <version>${version}</version> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + </dependency> </dependencies> <!-- Profiles --> Modified: projects/spec/trunk/pom.xml =================================================================== --- projects/spec/trunk/pom.xml 2008-10-29 14:14:52 UTC (rev 2658) +++ projects/spec/trunk/pom.xml 2008-10-29 14:37:50 UTC (rev 2659) @@ -210,7 +210,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <scope>test</scope> </dependency> </dependencies> </profile>