[jbpm-commits] JBoss JBPM SVN: r2710 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm and 27 other directories.

Author: tom.baeyens(a)jboss.com Date: 2008-10-31 12:17:37 -0400 (Fri, 31 Oct 2008) New Revision: 2710 Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/SpringConfiguration.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cmd/ Removed: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/env/PvmEnvironmentFactory.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/env/SpringEnvironmentFactory.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/Command.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/Db.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/DbTestCase.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/EnvironmentFactoryTestSetup.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/EnvironmentTestCase.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/JbpmTestCase.java Modified: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14LogFactory.java jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/LogFormatter.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/job/JobTestHelper.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionNamesCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/QueryCommand.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandExecutionService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandManagementService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandProcessService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AsyncCommandServiceBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ExecutionServiceBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobTestHelperBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ManagementServiceBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessServiceBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/StandardCommandServiceBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CommandServiceDescriptor.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentClassLoaderTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentTypeLookupTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerConfiguration.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessExecutionDbTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/type/VariableCustomTypeTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveTestCommand.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailOnceTestCommand.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailingTestCommand.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/TestMessageCommand.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ExamplesConfiguration.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex13/EnvironmentTest.java Log: unification api proposals Modified: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14LogFactory.java =================================================================== --- jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14LogFactory.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14LogFactory.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -26,9 +26,7 @@ import java.util.logging.LogManager; import java.util.logging.Logger; -import org.jbpm.PvmException; - /** * @author Tom Baeyens */ Modified: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/LogFormatter.java =================================================================== --- jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/LogFormatter.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/LogFormatter.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -11,8 +11,6 @@ import java.util.logging.Level; import java.util.logging.LogRecord; -import org.jbpm.pvm.internal.util.ReflectUtil; - public class LogFormatter extends Formatter { static final String NEWLINE = System.getProperty("line.separator"); @@ -52,7 +50,11 @@ msg.append("| ["); String loggerName = logRecord.getLoggerName(); - msg.append(ReflectUtil.getUnqualifiedClassName(loggerName)); + int dotIndex = loggerName.lastIndexOf('.'); + if (dotIndex!=-1) { + loggerName = loggerName.substring(dotIndex+1); + } + msg.append(loggerName); msg.append("] "); Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java (from rev 2701, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/env/PvmEnvironmentFactory.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -0,0 +1,230 @@ +/* + * 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.cfg; + +import java.io.File; +import java.io.InputStream; +import java.net.URL; +import java.util.Set; + +import org.jbpm.Configuration; +import org.jbpm.ExecutionService; +import org.jbpm.ManagementService; +import org.jbpm.ProcessEngine; +import org.jbpm.ProcessService; +import org.jbpm.ResourceManager; +import org.jbpm.TaskService; +import org.jbpm.log.Log; +import org.jbpm.pvm.env.Context; +import org.jbpm.pvm.env.Environment; +import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.pvm.internal.env.PvmEnvironment; +import org.jbpm.pvm.internal.env.PvmEnvironmentFactoryParser; +import org.jbpm.pvm.internal.stream.FileStreamSource; +import org.jbpm.pvm.internal.stream.InputStreamSource; +import org.jbpm.pvm.internal.stream.ResourceStreamSource; +import org.jbpm.pvm.internal.stream.StreamSource; +import org.jbpm.pvm.internal.stream.StringStreamSource; +import org.jbpm.pvm.internal.stream.UrlStreamSource; +import org.jbpm.pvm.internal.wire.WireContext; +import org.jbpm.pvm.internal.wire.WireDefinition; + +/** + * an environment factory that also is the environment-factory context. + * + * <p> + * This environment factory will produce environments with 2 contexts: the + * environment-factory context and the block context. + * </p> + * + * <p> + * An environment-factory context is build from two wire definitions: the + * environment-factory wire definition and the environment wire definition. + * </p> + * + * <p> + * The environment-factory context itself is build from the environment-factory + * wire definition. So all objects that are created in this context remain + * cached for the lifetime of this environment-factory context object. + * </p> + * + * <p> + * This environment-factory context is also a environment factory. The produced + * environments contain 2 contexts: the environment-factory context itself and a + * new environment context, build from the environment wire definition. For each + * created environment, a new environment context will be created from the same + * environment wire definition. Objects in the environment context will live for + * as long as the environment. + * </p> + * + * @author Tom Baeyens + */ +public class JbpmConfiguration extends Configuration implements Context, ProcessEngine, EnvironmentFactory { + + private static final long serialVersionUID = 1L; + private static final Log log = Log.getLog(JbpmConfiguration.class.getName()); + protected static PvmEnvironmentFactoryParser pvmEnvironmentFactoryParser = new PvmEnvironmentFactoryParser(); + + protected boolean isConfigured = false; + protected WireContext environmentFactoryCtxWireContext = null; + protected WireDefinition environmentCtxWireDefinition = null; + + public JbpmConfiguration() { + } + + public ProcessEngine buildProcessEngine() { + if (!isConfigured) { + setResource("jbpm.cfg.xml"); + } + return this; + } + + public void setInputStream(InputStream inputStream) { + parse(new InputStreamSource(inputStream)); + } + + public void setResource(String resource) { + parse(new ResourceStreamSource(resource, getClassLoader())); + } + + public void setUrl(URL url) { + parse(new UrlStreamSource(url)); + } + + public void setFile(File file) { + parse(new FileStreamSource(file)); + } + + public void setXmlString(String xmlString) { + parse(new StringStreamSource(xmlString)); + } + + protected void parse(StreamSource streamSource) { + isConfigured = true; + PvmEnvironmentFactoryParser.getInstance() + .createParse() + .setDocumentObject(this) + .setStreamSource(streamSource) + .execute() + .checkProblems("jbpm configuration " + streamSource); + } + + public ExecutionService getExecutionService() { + return environmentFactoryCtxWireContext.get(ExecutionService.class); + } + + public ManagementService getManagementService() { + return environmentFactoryCtxWireContext.get(ManagementService.class); + } + + public ProcessService getProcessService() { + return environmentFactoryCtxWireContext.get(ProcessService.class); + } + + public TaskService getTaskService() { + return environmentFactoryCtxWireContext.get(TaskService.class); + } + + public ResourceManager getResourceManager() { + return null; + } + + public static EnvironmentFactory parseXmlString(String xmlString) { + JbpmConfiguration jbpmConfiguration = new JbpmConfiguration(); + jbpmConfiguration.setXmlString(xmlString); + jbpmConfiguration.buildProcessEngine(); + return jbpmConfiguration; + } + + public Environment openEnvironment() { + PvmEnvironment environment = new PvmEnvironment(this); + + log.debug("opening " + environment); + + // set the classloader + ClassLoader classLoader = environmentFactoryCtxWireContext.getClassLoader(); + if (classLoader != null) { + environment.setClassLoader(classLoader); + } + + // add the environment-factory context + environment.addContext(environmentFactoryCtxWireContext); + + // add the environment block context + WireContext environmentContext = new WireContext(environmentCtxWireDefinition, Context.CONTEXTNAME_ENVIRONMENT, environment, true); + // add the environment block context to the environment + environment.addContext(environmentContext); + + // finish the creation of the environment wire context + environmentContext.create(); + + // if all went well, return the created environment + return environment; + } + + public void close() { + environmentFactoryCtxWireContext.fire(WireContext.EVENT_CLOSE, null); + } + + // environment-factory context delegation methods + // /////////////////////////////////// + + public Object get(String key) { + return environmentFactoryCtxWireContext.get(key); + } + + public <T> T get(Class<T> type) { + return environmentFactoryCtxWireContext.get(type); + } + + public String getName() { + return environmentFactoryCtxWireContext.getName(); + } + + public boolean has(String key) { + return environmentFactoryCtxWireContext.has(key); + } + + public Set<String> keys() { + return environmentFactoryCtxWireContext.keys(); + } + + public Object set(String key, Object value) { + return environmentFactoryCtxWireContext.set(key, value); + } + + // getters and setters ////////////////////////////////////////////////////// + + public void setEnvironmentCtxWireDefinition(WireDefinition blockWireDefinition) { + this.environmentCtxWireDefinition = blockWireDefinition; + } + public WireContext getEnvironmentFactoryCtxWireContext() { + return environmentFactoryCtxWireContext; + } + public void setEnvironmentFactoryCtxWireContext(WireContext applicationWireContext) { + this.environmentFactoryCtxWireContext = applicationWireContext; + } + public WireDefinition getEnvironmentCtxWireDefinition() { + return environmentCtxWireDefinition; + } + +} Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/SpringConfiguration.java (from rev 2701, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/env/SpringEnvironmentFactory.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/SpringConfiguration.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/SpringConfiguration.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -0,0 +1,98 @@ +/* + * 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.cfg; + +import java.util.HashSet; +import java.util.Set; + +import org.jbpm.pvm.env.EnvironmentFactory; +import org.jbpm.pvm.internal.spring.SpringEnvironment; +import org.jbpm.pvm.internal.util.ReflectUtil; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; + +/** this environment factory will see only the singleton beans. + * + * The created {@link SpringEnvironment}s will see the prototype + * beans and it will cache them. + * + * @author Tom Baeyens + */ +public class SpringConfiguration extends EnvironmentFactory implements ApplicationContextAware { + + // TODO pull up the common behaviour between this class and the SpringEnvironmentContext + + private static final long serialVersionUID = 1L; + + ApplicationContext applicationContext; + + public SpringEnvironment openEnvironment() { + return new SpringEnvironment(this); + } + + public boolean has(String key) { + return applicationContext.isSingleton(key); + } + + public Object get(String key) { + if (has(key)) { + return applicationContext.getBean(key); + } + return null; + } + + public <T> T get(Class<T> type) { + String name = ReflectUtil.getUnqualifiedClassName(type); + name = name.substring(0, 1).toLowerCase() + name.substring(1); + return (T) get(name); + } + + public Set<String> keys() { + HashSet<String> keys = new HashSet<String>(); + for (String key : applicationContext.getBeanDefinitionNames()) { + if (has(key)) { + keys.add(key); + } + } + return keys; + } + + public ApplicationContext getApplicationContext() { + return applicationContext; + } + + public void setApplicationContext(ApplicationContext applicationContext) { + this.applicationContext = applicationContext; + } + + + public void close() { + } + + public String getName() { + return null; + } + + public Object set(String key, Object value) { + return null; + } +} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/job/JobTestHelper.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/job/JobTestHelper.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/job/JobTestHelper.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -24,9 +24,9 @@ import org.hibernate.Query; import org.hibernate.Session; import org.jbpm.Execution; +import org.jbpm.cmd.Command; +import org.jbpm.cmd.CommandService; import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.internal.cmd.Command; -import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.job.TimerImpl; import org.jbpm.pvm.internal.jobexecutor.ExecuteJobCmd; Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/env/PvmEnvironmentFactory.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/env/PvmEnvironmentFactory.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/env/PvmEnvironmentFactory.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -1,188 +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.env; - -import java.io.File; -import java.io.InputStream; -import java.net.URL; -import java.util.Set; - -import org.jbpm.log.Log; -import org.jbpm.pvm.internal.env.PvmEnvironment; -import org.jbpm.pvm.internal.env.PvmEnvironmentFactoryParser; -import org.jbpm.pvm.internal.stream.FileStreamSource; -import org.jbpm.pvm.internal.stream.InputStreamSource; -import org.jbpm.pvm.internal.stream.ResourceStreamSource; -import org.jbpm.pvm.internal.stream.StreamSource; -import org.jbpm.pvm.internal.stream.StringStreamSource; -import org.jbpm.pvm.internal.stream.UrlStreamSource; -import org.jbpm.pvm.internal.wire.WireContext; -import org.jbpm.pvm.internal.wire.WireDefinition; - - -/** - * an environment factory that also is the environment-factory context. - * - * <p>This environment factory will produce environments with 2 contexts: - * the environment-factory context and the block context. - * </p> - * - * <p>An environment-factory context is build from two wire definitions: the environment-factory - * wire definition and the environment wire definition. - * </p> - * - * <p>The environment-factory context itself is build from the environment-factory wire definition. - * So all objects that are created in this context remain cached for the lifetime of - * this environment-factory context object. - * </p> - * - * <p>This environment-factory context is also a environment factory. The produced environments - * contain 2 contexts: the environment-factory context itself and a new environment context, - * build from the environment wire definition. For each created environment, a new - * environment context will be created from the same environment wire definition. - * Objects in the environment context will live for as long as the environment. - * </p> - * @author Tom Baeyens - */ -public class PvmEnvironmentFactory extends EnvironmentFactory implements Context { - - private static final long serialVersionUID = 1L; - private static final Log log = Log.getLog(PvmEnvironmentFactory.class.getName()); - protected static PvmEnvironmentFactoryParser pvmEnvironmentFactoryParser = new PvmEnvironmentFactoryParser(); - - protected WireContext environmentFactoryCtxWireContext = null; - protected WireDefinition environmentCtxWireDefinition = null; - - public PvmEnvironmentFactory() { - } - - public PvmEnvironmentFactory(String resource) { - this(resource, null); - } - - public PvmEnvironmentFactory(String resource, ClassLoader classLoader) { - this(new ResourceStreamSource(resource, classLoader)); - } - - public PvmEnvironmentFactory(File file) { - this(new FileStreamSource(file)); - } - - public PvmEnvironmentFactory(URL url) { - this(new UrlStreamSource(url)); - } - - public PvmEnvironmentFactory(InputStream inputStream) { - this(new InputStreamSource(inputStream)); - } - - public static PvmEnvironmentFactory parseXmlString(String xmlString) { - return new PvmEnvironmentFactory(new StringStreamSource(xmlString)); - } - - PvmEnvironmentFactory(StreamSource streamSource) { - PvmEnvironmentFactoryParser.getInstance() - .createParse() - .setDocumentObject(this) - .setStreamSource(streamSource) - .execute() - .checkProblems("pvm environment configuration "+streamSource); - } - - public Environment openEnvironment() { - PvmEnvironment environment = new PvmEnvironment(this); - - log.debug("opening "+environment); - - // set the classloader - ClassLoader classLoader = environmentFactoryCtxWireContext.getClassLoader(); - if (classLoader!=null) { - environment.setClassLoader(classLoader); - } - - // add the environment-factory context - environment.addContext(environmentFactoryCtxWireContext); - - // add the environment block context - WireContext environmentContext = new WireContext(environmentCtxWireDefinition, Context.CONTEXTNAME_ENVIRONMENT, environment, true); - // add the environment block context to the environment - environment.addContext(environmentContext); - - try { - // finish the creation of the environment wire context - environmentContext.create(); - - } catch (RuntimeException e) { - // On exception, pop environment - Environment.popEnvironment(); - throw e; - } - // if all went well, return the created environment - return environment; - } - - public void close() { - environmentFactoryCtxWireContext.fire(WireContext.EVENT_CLOSE, null); - } - - // environment-factory context delegation methods /////////////////////////////////// - - public Object get(String key) { - return environmentFactoryCtxWireContext.get(key); - } - - public <T> T get(Class<T> type) { - return environmentFactoryCtxWireContext.get(type); - } - - public String getName() { - return environmentFactoryCtxWireContext.getName(); - } - - public boolean has(String key) { - return environmentFactoryCtxWireContext.has(key); - } - - public Set<String> keys() { - return environmentFactoryCtxWireContext.keys(); - } - - public Object set(String key, Object value) { - return environmentFactoryCtxWireContext.set(key, value); - } - - // getters and setters ////////////////////////////////////////////////////// - - public void setEnvironmentCtxWireDefinition(WireDefinition blockWireDefinition) { - this.environmentCtxWireDefinition = blockWireDefinition; - } - public WireContext getEnvironmentFactoryCtxWireContext() { - return environmentFactoryCtxWireContext; - } - public void setEnvironmentFactoryCtxWireContext(WireContext applicationWireContext) { - this.environmentFactoryCtxWireContext = applicationWireContext; - } - public WireDefinition getEnvironmentCtxWireDefinition() { - return environmentCtxWireDefinition; - } - -} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/env/SpringEnvironmentFactory.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/env/SpringEnvironmentFactory.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/env/SpringEnvironmentFactory.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -1,97 +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.env; - -import java.util.HashSet; -import java.util.Set; - -import org.jbpm.pvm.internal.spring.SpringEnvironment; -import org.jbpm.pvm.internal.util.ReflectUtil; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; - -/** this environment factory will see only the singleton beans. - * - * The created {@link SpringEnvironment}s will see the prototype - * beans and it will cache them. - * - * @author Tom Baeyens - */ -public class SpringEnvironmentFactory extends EnvironmentFactory implements ApplicationContextAware { - - // TODO pull up the common behaviour between this class and the SpringEnvironmentContext - - private static final long serialVersionUID = 1L; - - ApplicationContext applicationContext; - - public SpringEnvironment openEnvironment() { - return new SpringEnvironment(this); - } - - public boolean has(String key) { - return applicationContext.isSingleton(key); - } - - public Object get(String key) { - if (has(key)) { - return applicationContext.getBean(key); - } - return null; - } - - public <T> T get(Class<T> type) { - String name = ReflectUtil.getUnqualifiedClassName(type); - name = name.substring(0, 1).toLowerCase() + name.substring(1); - return (T) get(name); - } - - public Set<String> keys() { - HashSet<String> keys = new HashSet<String>(); - for (String key : applicationContext.getBeanDefinitionNames()) { - if (has(key)) { - keys.add(key); - } - } - return keys; - } - - public ApplicationContext getApplicationContext() { - return applicationContext; - } - - public void setApplicationContext(ApplicationContext applicationContext) { - this.applicationContext = applicationContext; - } - - - public void close() { - } - - public String getName() { - return null; - } - - public Object set(String key, Object value) { - return null; - } -} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AbstractCommand.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,6 +21,7 @@ */ package org.jbpm.pvm.internal.cmd; +import org.jbpm.cmd.Command; import org.jbpm.pvm.client.ClientExecution; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.model.ExecutionImpl; Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/Command.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/Command.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/Command.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -1,10 +0,0 @@ -package org.jbpm.pvm.internal.cmd; - -import java.io.Serializable; - -import org.jbpm.pvm.env.Environment; - -public interface Command<T> extends Serializable { - - T execute(Environment environment) throws Exception; -} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandService.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandService.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CommandService.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -1,22 +0,0 @@ -package org.jbpm.pvm.internal.cmd; - -import org.jbpm.PvmException; - -/** - * abstract extensible session facade. Developers can use this directly or - * extend one of the implementations with custom methods. - * Developers should be encouraged to use this interface as it will - * be kept more stable then direct usage of the API (which is still - * allowed). - * All the method implementations should be based on commands. - * Each of the method implementations will have a environment block. - * Then the command is executed and the environment is passed into the - * command. - */ -public interface CommandService { - - /** - * @throws PvmException if command throws an exception. - */ - <T> T execute(Command<T> command); -} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/DeployCmd.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -23,6 +23,7 @@ import org.jbpm.ProcessDefinition; import org.jbpm.PvmException; +import org.jbpm.cmd.Command; import org.jbpm.pvm.DeploymentImpl; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.deploy.DeployerManager; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindExecutionCmd.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -23,6 +23,7 @@ import org.jbpm.Execution; import org.jbpm.PvmException; +import org.jbpm.cmd.Command; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.session.PvmDbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionCmd.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindLatestProcessDefinitionCmd.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,6 +21,7 @@ */ package org.jbpm.pvm.internal.cmd; +import org.jbpm.cmd.Command; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.model.OpenProcessDefinition; import org.jbpm.pvm.session.PvmDbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionCmd.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionCmd.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -22,6 +22,7 @@ package org.jbpm.pvm.internal.cmd; import org.jbpm.PvmException; +import org.jbpm.cmd.Command; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; import org.jbpm.pvm.model.OpenProcessDefinition; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionNamesCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionNamesCmd.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionNamesCmd.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -23,6 +23,7 @@ import java.util.List; +import org.jbpm.cmd.Command; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.session.PvmDbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsCmd.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/FindProcessDefinitionsCmd.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -23,6 +23,7 @@ import java.util.List; +import org.jbpm.cmd.Command; import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.session.PvmDbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/GetVariablesCmd.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -26,6 +26,7 @@ import java.util.Map; import org.jbpm.PvmException; +import org.jbpm.cmd.Command; import org.jbpm.pvm.client.ClientExecution; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.session.PvmDbSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/QueryCommand.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/QueryCommand.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/QueryCommand.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,6 +21,8 @@ */ package org.jbpm.pvm.internal.cmd; +import org.jbpm.cmd.Command; + /** base class for commands that execute scalable queries. * * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/SignalCmd.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -25,6 +25,7 @@ import org.jbpm.Execution; import org.jbpm.PvmException; +import org.jbpm.cmd.Command; import org.jbpm.pvm.client.ClientExecution; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.model.ExecutionImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.internal.env; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.log.Log; import org.jbpm.pvm.env.Context; -import org.jbpm.pvm.env.PvmEnvironmentFactory; import org.jbpm.pvm.internal.util.Closable; @@ -36,10 +36,10 @@ private static final Log log = Log.getLog(PvmEnvironment.class.getName()); - protected PvmEnvironmentFactory pvmEnvironmentFactory; + protected JbpmConfiguration jbpmConfiguration; - public PvmEnvironment(PvmEnvironmentFactory pvmEnvironmentFactory) { - this.pvmEnvironmentFactory = pvmEnvironmentFactory; + public PvmEnvironment(JbpmConfiguration jbpmConfiguration) { + this.jbpmConfiguration = jbpmConfiguration; } public String toString() { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.internal.env; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.pvm.env.Context; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; import org.jbpm.pvm.internal.stream.StreamSource; import org.jbpm.pvm.internal.util.XmlUtil; import org.jbpm.pvm.internal.wire.WireContext; @@ -70,10 +70,10 @@ Element documentElement = document.getDocumentElement(); // if the default environment factory was already set in the parse - PvmEnvironmentFactory pvmEnvironmentFactory = (PvmEnvironmentFactory) parse.getDocumentObject(); - if (pvmEnvironmentFactory==null) { - pvmEnvironmentFactory = new PvmEnvironmentFactory(); - parse.setDocumentObject(pvmEnvironmentFactory); + JbpmConfiguration jbpmConfiguration = (JbpmConfiguration) parse.getDocumentObject(); + if (jbpmConfiguration==null) { + jbpmConfiguration = new JbpmConfiguration(); + parse.setDocumentObject(jbpmConfiguration); } WireDefinition environmentFactoryWireDefinition = getApplicationWireDefinition(documentElement, parse); @@ -85,12 +85,12 @@ environmentFactoryWireContext.setClassLoader(classLoader); // configure the default environment factory - pvmEnvironmentFactory.setEnvironmentFactoryCtxWireContext(environmentFactoryWireContext); - pvmEnvironmentFactory.setEnvironmentCtxWireDefinition(environmentWireDefinition); + jbpmConfiguration.setEnvironmentFactoryCtxWireContext(environmentFactoryWireContext); + jbpmConfiguration.setEnvironmentCtxWireDefinition(environmentWireDefinition); - parse.setDocumentObject(pvmEnvironmentFactory); + parse.setDocumentObject(jbpmConfiguration); - return pvmEnvironmentFactory; + return jbpmConfiguration; } WireDefinition getApplicationWireDefinition(Element documentElement, Parse parse) { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.job; +import org.jbpm.cmd.Command; import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.jobexecutor.JobDbSession; import org.jbpm.pvm.internal.wire.Descriptor; import org.jbpm.pvm.internal.wire.WireContext; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.Date; +import org.jbpm.cmd.Command; import org.jbpm.job.Job; -import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.wire.Descriptor; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/AcquireJobsCmd.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -28,9 +28,9 @@ import java.util.Date; import java.util.List; +import org.jbpm.cmd.Command; import org.jbpm.log.Log; import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.job.JobImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -24,9 +24,9 @@ import java.util.Collection; import java.util.Date; +import org.jbpm.cmd.Command; +import org.jbpm.cmd.CommandService; import org.jbpm.log.Log; -import org.jbpm.pvm.internal.cmd.Command; -import org.jbpm.pvm.internal.cmd.CommandService; /** this thread is responsible for acquiring jobs in the jobImpl that need to be * executed and then let the JobExecutor dispatch the acquired ids to one of the Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -25,12 +25,12 @@ import org.hibernate.Session; import org.jbpm.PvmException; +import org.jbpm.cmd.Command; +import org.jbpm.cmd.CommandService; import org.jbpm.job.Job; import org.jbpm.log.Log; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.Transaction; -import org.jbpm.pvm.internal.cmd.Command; -import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.internal.job.JobImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/GetNextDueDateCmd.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -23,9 +23,9 @@ import java.util.Date; +import org.jbpm.cmd.Command; import org.jbpm.log.Log; import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.job.JobImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -28,11 +28,11 @@ import org.hibernate.Session; import org.jbpm.PvmException; +import org.jbpm.cmd.Command; +import org.jbpm.cmd.CommandService; import org.jbpm.log.Log; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.Transaction; -import org.jbpm.pvm.internal.cmd.Command; -import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.internal.job.JobImpl; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -31,9 +31,9 @@ import java.util.concurrent.BlockingQueue; import org.jbpm.PvmException; +import org.jbpm.cmd.Command; +import org.jbpm.cmd.CommandService; import org.jbpm.log.Log; -import org.jbpm.pvm.internal.cmd.Command; -import org.jbpm.pvm.internal.cmd.CommandService; /** manager for jobImpl execution threads and their configuration. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -30,8 +30,8 @@ import javax.servlet.http.HttpServletResponse; import org.jbpm.PvmException; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; /** * starts the jobImpl executor on init and closes the @@ -82,7 +82,7 @@ public void init() throws ServletException { String configurationResource = getInitParameter("jbpm.configuration.resource", "jbpm.cfg.xml"); - EnvironmentFactory environmentFactory = new PvmEnvironmentFactory(configurationResource); + EnvironmentFactory environmentFactory = new JbpmConfiguration(configurationResource); jobExecutor = environmentFactory.get(JobExecutor.class); if (jobExecutor==null) { throw new PvmException("no jobImpl executor configured in resource "+configurationResource); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -24,8 +24,8 @@ import java.util.Collection; import java.util.concurrent.BlockingQueue; +import org.jbpm.cmd.CommandService; import org.jbpm.log.Log; -import org.jbpm.pvm.internal.cmd.CommandService; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerImpl.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -27,10 +27,10 @@ import org.jbpm.PvmException; +import org.jbpm.cmd.CommandService; import org.jbpm.log.Log; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.Transaction; -import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.internal.model.op.MoveToChildNode; import org.jbpm.pvm.internal.wire.Descriptor; import org.jbpm.pvm.listener.EventListener; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExceptionHandlerSynchronization.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -25,11 +25,11 @@ import javax.transaction.Synchronization; import org.jbpm.PvmException; +import org.jbpm.cmd.Command; +import org.jbpm.cmd.CommandService; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; import org.jbpm.pvm.env.Transaction; -import org.jbpm.pvm.internal.cmd.Command; -import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.session.DbSession; public class ExceptionHandlerSynchronization implements Synchronization, Command<Object> { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/CommandTransactionCallback.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.internal.spring; +import org.jbpm.cmd.Command; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.internal.cmd.Command; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallback; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringCommandService.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -22,10 +22,10 @@ package org.jbpm.pvm.internal.spring; import org.hibernate.Session; +import org.jbpm.cmd.Command; +import org.jbpm.cmd.CommandService; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.internal.cmd.Command; -import org.jbpm.pvm.internal.cmd.CommandService; import org.springframework.orm.hibernate3.HibernateTransactionManager; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; import org.springframework.transaction.support.TransactionTemplate; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.spring; +import org.jbpm.cfg.SpringConfiguration; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.SpringEnvironmentFactory; import org.jbpm.pvm.internal.env.BasicEnvironment; import org.springframework.context.ApplicationContext; @@ -37,9 +37,9 @@ protected ApplicationContext applicationContext; - public SpringEnvironment(SpringEnvironmentFactory springEnvironmentFactory) { - addContext(springEnvironmentFactory); - addContext(new SpringEnvironmentContext(springEnvironmentFactory.getApplicationContext())); + public SpringEnvironment(SpringConfiguration springConfiguration) { + addContext(springConfiguration); + addContext(new SpringEnvironmentContext(springConfiguration.getApplicationContext())); } public ClassLoader getClassLoader() { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandMessage.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.internal.svc; +import org.jbpm.cmd.Command; +import org.jbpm.cmd.CommandService; import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.internal.cmd.Command; -import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.internal.job.MessageImpl; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AsyncCommandService.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -22,9 +22,9 @@ package org.jbpm.pvm.internal.svc; import org.jbpm.PvmException; +import org.jbpm.cmd.Command; +import org.jbpm.cmd.CommandService; import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.internal.cmd.Command; -import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.session.MessageSession; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationInterceptor.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -22,8 +22,8 @@ package org.jbpm.pvm.internal.svc; import org.jbpm.PvmException; +import org.jbpm.cmd.Command; import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.internal.cmd.Command; /** performs an authorization check before the command is executed. * @author Tom Baeyens Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/AuthorizationSession.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -1,7 +1,7 @@ package org.jbpm.pvm.internal.svc; +import org.jbpm.cmd.Command; import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.internal.cmd.Command; public interface AuthorizationSession { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandExecutionService.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandExecutionService.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandExecutionService.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -27,7 +27,7 @@ import org.jbpm.Execution; import org.jbpm.ExecutionService; -import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.cmd.CommandService; import org.jbpm.pvm.internal.cmd.FindExecutionCmd; import org.jbpm.pvm.internal.cmd.GetVariablesCmd; import org.jbpm.pvm.internal.cmd.SetVariablesCmd; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandManagementService.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandManagementService.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandManagementService.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -24,10 +24,10 @@ import java.util.List; import org.jbpm.ManagementService; +import org.jbpm.cmd.CommandService; import org.jbpm.job.Job; import org.jbpm.job.Message; import org.jbpm.job.Timer; -import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.internal.cmd.GetMessagesCmd; import org.jbpm.pvm.internal.cmd.GetTimersCmd; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandProcessService.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandProcessService.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/CommandProcessService.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -26,8 +26,8 @@ import org.jbpm.Deployment; import org.jbpm.ProcessDefinition; import org.jbpm.ProcessService; +import org.jbpm.cmd.CommandService; import org.jbpm.pvm.DeploymentImpl; -import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.internal.cmd.DeployCmd; import org.jbpm.pvm.internal.cmd.FindLatestProcessDefinitionCmd; import org.jbpm.pvm.internal.cmd.FindProcessDefinitionCmd; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DefaultCommandService.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -22,10 +22,10 @@ package org.jbpm.pvm.internal.svc; import org.jbpm.PvmException; +import org.jbpm.cmd.Command; +import org.jbpm.cmd.CommandService; import org.jbpm.log.Log; import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.internal.cmd.Command; -import org.jbpm.pvm.internal.cmd.CommandService; /** Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/EnvironmentInterceptor.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.internal.svc; +import org.jbpm.cmd.Command; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.internal.cmd.Command; /** sets up an environment around the execution of the command. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/Interceptor.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.svc; +import org.jbpm.cmd.CommandService; import org.jbpm.log.Log; -import org.jbpm.pvm.internal.cmd.CommandService; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/RetryInterceptor.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -22,8 +22,8 @@ package org.jbpm.pvm.internal.svc; import org.jbpm.PvmException; +import org.jbpm.cmd.Command; import org.jbpm.log.Log; -import org.jbpm.pvm.internal.cmd.Command; import org.hibernate.StaleStateException; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransactionInterceptor.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -22,9 +22,9 @@ package org.jbpm.pvm.internal.tx; import org.jbpm.PvmException; +import org.jbpm.cmd.Command; import org.jbpm.log.Log; import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.svc.Interceptor; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -29,12 +29,12 @@ import java.util.Map; import java.util.Set; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.log.Log; import org.jbpm.pvm.activity.Activity; import org.jbpm.pvm.env.Context; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; import org.jbpm.pvm.internal.model.ProcessElementImpl; import org.jbpm.pvm.internal.util.Closable; import org.jbpm.pvm.internal.util.DefaultObservable; @@ -66,7 +66,7 @@ * * <p>A WireContext is used often in combination with {@link Environment} to * decouple the processDefinition virtual machine from its environment. In the - * {@link PvmEnvironmentFactory}, both the environment-factory context and + * {@link JbpmConfiguration}, both the environment-factory context and * the environment contexts are WireContexts. The PVM will use the persistence service, * asynchronous message service, timer service and other services through specified * abstractions in the environment. @@ -244,7 +244,7 @@ * set to true, the {@link #create()} method needs to be called explicitly by the client after * construction is complete. The use case is creation of environment where the transactionName needs to be * set and the scope needs to be added to the environment before the creation of this wire scope is done. - * @see PvmEnvironmentFactory#openEnvironment() + * @see JbpmConfiguration#openEnvironment() */ public WireContext(WireDefinition wireDefinition, String name, Environment environment, boolean delayCreate) { this.wireDefinition = wireDefinition; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AsyncCommandServiceBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AsyncCommandServiceBinding.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/AsyncCommandServiceBinding.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.wire.binding; -import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.cmd.CommandService; import org.jbpm.pvm.internal.svc.AsyncCommandService; import org.jbpm.pvm.internal.util.XmlUtil; import org.jbpm.pvm.internal.xml.Parse; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ExecutionServiceBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ExecutionServiceBinding.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ExecutionServiceBinding.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.wire.binding; -import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.cmd.CommandService; import org.jbpm.pvm.internal.svc.CommandExecutionService; import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.wire.binding; -import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.cmd.CommandService; import org.jbpm.pvm.internal.jobexecutor.JobExecutor; import org.jbpm.pvm.internal.util.XmlUtil; import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobTestHelperBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobTestHelperBinding.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobTestHelperBinding.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.wire.binding; +import org.jbpm.cmd.CommandService; import org.jbpm.job.JobTestHelper; -import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ManagementServiceBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ManagementServiceBinding.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ManagementServiceBinding.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.wire.binding; -import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.cmd.CommandService; import org.jbpm.pvm.internal.svc.CommandManagementService; import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessServiceBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessServiceBinding.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessServiceBinding.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,7 +21,7 @@ */ package org.jbpm.pvm.internal.wire.binding; -import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.cmd.CommandService; import org.jbpm.pvm.internal.svc.CommandProcessService; import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/StandardCommandServiceBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/StandardCommandServiceBinding.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/StandardCommandServiceBinding.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -23,7 +23,7 @@ import java.util.List; -import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.cmd.CommandService; import org.jbpm.pvm.internal.svc.DefaultCommandService; import org.jbpm.pvm.internal.util.XmlUtil; import org.jbpm.pvm.internal.wire.Descriptor; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CommandServiceDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CommandServiceDescriptor.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/CommandServiceDescriptor.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.List; -import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.cmd.CommandService; import org.jbpm.pvm.internal.svc.Interceptor; import org.jbpm.pvm.internal.wire.Descriptor; import org.jbpm.pvm.internal.wire.WireContext; Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/Db.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/Db.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/Db.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -1,120 +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.test; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.cfg.Configuration; -import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.MySQLDialect; -import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.mapping.ForeignKey; -import org.hibernate.mapping.Table; -import org.jbpm.pvm.env.EnvironmentFactory; - - -/** - * @author Tom Baeyens - */ -public class Db { - - private static final String CLEAN_SQL_KEY = "cleanSql"; - - public static void clean(EnvironmentFactory environmentFactory) { - SessionFactory sessionFactory = environmentFactory.get(SessionFactory.class); - String[] cleanSql = (String[]) environmentFactory.get(CLEAN_SQL_KEY); - - if (cleanSql == null) { - Configuration configuration = environmentFactory.get(Configuration.class); - - SessionFactoryImplementor sessionFactoryImplementor = (SessionFactoryImplementor) sessionFactory; - Dialect dialect = sessionFactoryImplementor.getDialect(); - - // loop over all foreign key constraints - List<String> dropForeignKeysSql = new ArrayList<String>(); - List<String> createForeignKeysSql = new ArrayList<String>(); - Iterator<Table> iter = configuration.getTableMappings(); - while (iter.hasNext()) { - Table table = (Table) iter.next(); - if (table.isPhysicalTable()) { - String catalog = table.getCatalog(); - String schema = table.getSchema(); - Iterator<ForeignKey> subIter = table.getForeignKeyIterator(); - while (subIter.hasNext()) { - ForeignKey fk = (ForeignKey) subIter.next(); - if (fk.isPhysicalConstraint()) { - // collect the drop foreign key constraint sql - dropForeignKeysSql.add(fk.sqlDropString(dialect, catalog, schema)); - // MySQLDialect creates an index for each foreign key. - // see - // http://opensource.atlassian.com/projects/hibernate/browse/HHH-2155 - // This index should be dropped or an error will be thrown during - // the creation phase - if (dialect instanceof MySQLDialect) { - dropForeignKeysSql.add("alter table " + table.getName() + " drop key " + fk.getName()); - } - // and collect the create foreign key constraint sql - createForeignKeysSql.add(fk.sqlCreateString(dialect, sessionFactoryImplementor, catalog, schema)); - } - } - } - } - - List<String> deleteSql = new ArrayList<String>(); - iter = configuration.getTableMappings(); - while (iter.hasNext()) { - Table table = (Table) iter.next(); - if (table.isPhysicalTable()) { - deleteSql.add("delete from " + table.getName()); - } - } - - // glue - // - drop foreign key constraints - // - delete contents of all tables - // - create foreign key constraints - // together to form the clean script - List<String> cleanSqlList = new ArrayList<String>(); - cleanSqlList.addAll(dropForeignKeysSql); - cleanSqlList.addAll(deleteSql); - cleanSqlList.addAll(createForeignKeysSql); - - cleanSql = (String[]) cleanSqlList.toArray(new String[cleanSqlList.size()]); - - environmentFactory.set(CLEAN_SQL_KEY, cleanSql); - } - - Session session = sessionFactory.openSession(); - try { - for (String query : cleanSql) { - session.createSQLQuery(query).executeUpdate(); - } - } finally { - session.close(); - } - } - -} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/DbTestCase.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/DbTestCase.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/DbTestCase.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -1,71 +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.test; - -import org.jbpm.ExecutionService; -import org.jbpm.ManagementService; -import org.jbpm.ProcessService; -import org.jbpm.pvm.internal.cmd.CommandService; - - -/** for tests that use persistence through a command service. - * - * The DB is cleaned inbetween tests. No environment is created. - * - * @author Tom Baeyens - */ -public abstract class DbTestCase extends EnvironmentFactoryTestCase { - - protected CommandService commandService; - protected ProcessService processService; - protected ExecutionService executionService; - protected ManagementService managementService; - - public DbTestCase() { - super(); - } - - public DbTestCase(String configResource) { - super(configResource); - } - - public void setUp() throws Exception { - super.setUp(); - - if (isEnvironmentFactoryCached()) { - Db.clean(getEnvironmentFactory()); - } - - commandService = getEnvironmentFactory().get(CommandService.class); - processService = getEnvironmentFactory().get(ProcessService.class); - executionService = getEnvironmentFactory().get(ExecutionService.class); - managementService = getEnvironmentFactory().get(ManagementService.class); - } - - public void tearDown() throws Exception { - commandService = null; - processService = null; - executionService = null; - managementService = null; - super.tearDown(); - } -} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -1,154 +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.test; - -import java.lang.reflect.Field; - -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.Transaction; -import org.jbpm.Execution; -import org.jbpm.pvm.internal.model.ExecutionImpl; -import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; -import org.jbpm.pvm.internal.util.ReflectUtil; -import org.jbpm.pvm.model.OpenProcessDefinition; -import org.jbpm.pvm.session.DbSession; -import org.jbpm.pvm.session.PvmDbSession; - - -/** for tests that use persistence inside environment blocks. - * - * An environment is opened in the setUp and closed in the tearDown. - * DB is cleaned inbetween tests. Extra convenience methods for usage - * inside an environment block are provided. - * - * @author Tom Baeyens - */ -public class EnvironmentDbTestCase extends EnvironmentTestCase { - - Transaction transaction = null; - - public EnvironmentDbTestCase() { - } - - public EnvironmentDbTestCase(String configResource) { - super(configResource); - } - - public void setUp() throws Exception { - if (isEnvironmentFactoryCached()) { - Db.clean(getEnvironmentFactory()); - } - super.setUp(); - beginTransaction(); - } - - public void tearDown() throws Exception { - commitTransaction(); - super.tearDown(); - } - - void beginTransaction() { - Session session = environment.get(Session.class); - transaction = session.beginTransaction(); - } - - void commitTransaction() { - transaction.commit(); - transaction = null; - } - - void rollbackTransaction() { - transaction.rollback(); - transaction = null; - } - - public DbSession getDbSession() { - return environment.get(DbSession.class); - } - - public void rollbackAndBeginNewTransaction() { - rollbackTransaction(); - closeEnvironment(); - openEnvironment(); - beginTransaction(); - } - - public void newTransaction() { - try { - commitTransaction(); - closeEnvironment(); - } finally { - openEnvironment(); - beginTransaction(); - } - } - - public void beginCacheTest() { - SessionFactory sessionFactory = environment.get(SessionFactory.class); - if (sessionFactory != null) { - log.debug("================================================================="); - log.debug("Beginning of the cache test, no more sql query should be performed before the end of the test"); - log.debug("================================================================="); - - sessionFactory.getStatistics().clear(); - sessionFactory.getStatistics().setStatisticsEnabled(true); - } - } - - public void endCacheTest() { - SessionFactory sessionFactory = environment.get(SessionFactory.class); - if (sessionFactory != null) { - assertEquals(0, sessionFactory.getStatistics().getEntityLoadCount()); - assertEquals(0, sessionFactory.getStatistics().getCollectionLoadCount()); - } - } - - public ProcessDefinitionImpl reload(OpenProcessDefinition processDefinition) { - environment.get(PvmDbSession.class).save(processDefinition); - newTransaction(); - return environment.get(PvmDbSession.class).get(ProcessDefinitionImpl.class, processDefinition.getDbid()); - } - - public <T> T reload(T object, Class<T> persistentClass) { - environment.get(DbSession.class).save(object); - newTransaction(); - - Long dbid = null; - try { - Field dbidField = ReflectUtil.getField(persistentClass, "dbid"); - dbidField.setAccessible(true); - dbid = (Long) dbidField.get(object); - } catch (Exception e) { - e.printStackTrace(); - } - - return environment.get(DbSession.class).get(persistentClass, dbid); - } - - public ExecutionImpl reload(Execution execution) { - environment.get(PvmDbSession.class).save(execution); - newTransaction(); - return environment.get(PvmDbSession.class).get(ExecutionImpl.class, execution.getDbid()); - } - -} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -1,82 +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.test; - -import java.util.HashMap; -import java.util.Map; - -import org.jbpm.PvmException; -import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; - - -/** - * @author Tom Baeyens - */ -public abstract class EnvironmentFactoryTestCase extends JbpmTestCase { - - String configResource; - - static Map<String, EnvironmentFactory> environmentFactories = new HashMap<String, EnvironmentFactory>(); - - public EnvironmentFactoryTestCase() { - this("environment.cfg.xml"); - } - - public EnvironmentFactoryTestCase(String configResource) { - this.configResource = configResource; - } - - public EnvironmentFactory getEnvironmentFactory() { - if (isEnvironmentFactoryCached()) { - return environmentFactories.get(configResource); - } - return createEnvironmentFactory(); - } - - boolean isEnvironmentFactoryCached() { - return environmentFactories.containsKey(configResource); - } - - EnvironmentFactory createEnvironmentFactory() { - return createEnvironmentFactory(configResource); - } - - static EnvironmentFactory createEnvironmentFactory(String configResource) { - try { - log.debug("creating environment factory for ["+configResource+"]"); - EnvironmentFactory newEnvironmentFactory = new PvmEnvironmentFactory(configResource); - environmentFactories.put(configResource, newEnvironmentFactory); - return newEnvironmentFactory; - } catch (Exception e) { - throw new PvmException("Exception during creation of environment factory for "+configResource, e); - } - } - - static void closeEnvironmentFactory(String configResource) { - EnvironmentFactory environmentFactory = environmentFactories.remove(configResource); - if (environmentFactory!=null) { - log.debug("closing environment factory for ["+configResource+"]"); - environmentFactory.close(); - } - } -} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/EnvironmentFactoryTestSetup.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/EnvironmentFactoryTestSetup.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/EnvironmentFactoryTestSetup.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -1,63 +0,0 @@ -/** - * Copyright (C) 2007 Bull S. A. S. - * Bull, Rue Jean Jaures, B.P.68, 78340, Les Clayes-sous-Bois - * This library 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 - * version 2.1 of the License. - * This library 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 - * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth - * Floor, Boston, MA 02110-1301, USA. - **/ -package org.jbpm.test; - -import junit.extensions.TestSetup; -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * @author Guillaume Porcher - * - */ -public class EnvironmentFactoryTestSetup extends TestSetup -{ - private String configResource; - - public EnvironmentFactoryTestSetup(Test test) - { - this(test, "environment.cfg.xml"); - } - - public EnvironmentFactoryTestSetup(Class<?> testClass) - { - this(new TestSuite(testClass), "environment.cfg.xml"); - } - - public EnvironmentFactoryTestSetup(Test test, String configResource) - { - super(test); - this.configResource = configResource; - } - - public EnvironmentFactoryTestSetup(Class<?> testClass, String configResource) - { - super(new TestSuite(testClass)); - this.configResource = configResource; - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - EnvironmentFactoryTestCase.createEnvironmentFactory(configResource); - } - - @Override - protected void tearDown() throws Exception - { - EnvironmentFactoryTestCase.closeEnvironmentFactory(configResource); - super.tearDown(); - } -} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/EnvironmentTestCase.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/EnvironmentTestCase.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/EnvironmentTestCase.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -1,58 +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.test; - -import org.jbpm.pvm.env.Environment; - -/** - * @author Tom Baeyens - */ -public abstract class EnvironmentTestCase extends EnvironmentFactoryTestCase { - - protected Environment environment; - - public EnvironmentTestCase() { - } - - public EnvironmentTestCase(String configResource) { - super(configResource); - } - - public void setUp() throws Exception { - super.setUp(); - openEnvironment(); - } - - public void tearDown() throws Exception { - closeEnvironment(); - super.tearDown(); - } - - void closeEnvironment() { - environment.close(); - environment = null; - } - - void openEnvironment() { - environment = getEnvironmentFactory().openEnvironment(); - } -} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/JbpmTestCase.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/JbpmTestCase.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/test/JbpmTestCase.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -1,79 +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.test; - -import junit.framework.AssertionFailedError; -import junit.framework.TestCase; - -import org.jbpm.log.Jdk14LogFactory; -import org.jbpm.log.Log; -import org.jbpm.log.LogFormatter; -import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; - -public abstract class JbpmTestCase extends TestCase { - - static { - Jdk14LogFactory.initializeJdk14Logging(); - } - - static protected Log log = Log.getLog(JbpmTestCase.class.getName()); - - public void setUp() throws Exception { - assertNull(Environment.getCurrent()); - LogFormatter.resetIndentation(); - log.info("=== starting "+getName()+" ============================="); - } - - public void tearDown() throws Exception { - log.info("=== ending "+getName()+" =============================\n"); - assertNull(Environment.getCurrent()); - } - - public void assertTextPresent(String expected, String value) { - if ( (value==null) - || (value.indexOf(expected)==-1) - ) { - throw new AssertionFailedError("expected presence of '"+expected+"' but was '"+value+"'"); - } - } - - public static Environment openEnvironment(String xmlString) { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString(xmlString); - return environmentFactory.openEnvironment(); - } - - protected void runTest() throws Throwable { - try { - super.runTest(); - } catch (AssertionFailedError e) { - log.error(""); - log.error("ASSERTION FAILURE: "+e.getMessage()); - log.error(""); - throw e; - } catch (Throwable t) { - t.printStackTrace(); - throw t; - } - } -} Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -31,12 +31,12 @@ import junit.framework.Test; import org.hibernate.Session; +import org.jbpm.cmd.Command; import org.jbpm.log.Log; import org.jbpm.pvm.client.ClientExecution; import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.job.JobImpl; import org.jbpm.pvm.internal.jobexecutor.JobExecutor; import org.jbpm.pvm.model.OpenProcessDefinition; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,10 +21,10 @@ */ package org.jbpm.pvm.api.env; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.pvm.env.Context; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; import org.jbpm.test.JbpmTestCase; /** @@ -34,7 +34,7 @@ public class BasicEnvironmentTest extends JbpmTestCase { public void testBasicEnvironmentOperation() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory>" + " <object name='a' class='"+Object.class.getName()+"' />" + @@ -77,7 +77,7 @@ } public void testCurrentEnvironment(){ - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory/>" + " <environment/>" + @@ -107,7 +107,7 @@ public void testUnexistingElement() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory>" + " <object name='a' class='"+Object.class.getName()+"' />" + @@ -128,7 +128,7 @@ } public void testNoBlockEnvironment(){ - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory/>" + "</contexts>" @@ -149,7 +149,7 @@ } public void testNoApplicationEnvironment(){ - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment/>" + "</contexts>" @@ -171,7 +171,7 @@ } public void testEmptyEnvironment(){ - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment/>" ); assertNotNull(environmentFactory); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentClassLoaderTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentClassLoaderTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentClassLoaderTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.api.env; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; import org.jbpm.test.JbpmTestCase; /** @@ -35,7 +35,7 @@ } public void testDefaultClassLoader() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment />" ); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.api.env; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.pvm.internal.wire.WireDefinition; import org.jbpm.pvm.internal.wire.xml.WireParser; @@ -36,7 +36,7 @@ { public void testEnvironmentDefaultSearchOrder() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory>" + " <string name='a' value='environment-factory-a' />" + @@ -58,7 +58,7 @@ } public void testEnvironmentGivenSearchOrder() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory>" + " <string name='a' value='environment-factory-a' />" + @@ -82,7 +82,7 @@ } public void testEnvironmentGivenSearchOrderUnexistingObject() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory>" + " <string name='a' value='environment-factory-a' />" + @@ -108,7 +108,7 @@ public void testEnvironmentDefaultSearchOrderWithAddedContext() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory>" + " <string name='a' value='environment-factory-a' />" + @@ -142,7 +142,7 @@ } public void testEnvironmentGivenSearchOrderWithAddedContext() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory>" + " <string name='a' value='environment-factory-a' />" + Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentTypeLookupTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentTypeLookupTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentTypeLookupTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.api.env; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; import org.jbpm.test.JbpmTestCase; /** @@ -35,7 +35,7 @@ } public void testApplicationTypeLookup() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory>" + " <object class='"+A.class.getName()+"' />" + @@ -59,7 +59,7 @@ public void testBlockTypeLookup() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory>" + " <string name='a' value='distraction' />" + @@ -83,7 +83,7 @@ public void testNonExistingTypeLookup() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory>" + " <string name='a' value='A' />" + Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.api.env; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; import org.jbpm.test.JbpmTestCase; /** @@ -33,7 +33,7 @@ { public void testNestedEnvironments() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory>" + " <object name='a' class='"+Object.class.getName()+"' />" + Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -22,10 +22,10 @@ package org.jbpm.pvm.api.spring; import org.hibernate.Session; +import org.jbpm.cmd.Command; +import org.jbpm.cmd.CommandService; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.internal.cmd.Command; -import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.test.JbpmTestCase; import org.springframework.context.support.ClassPathXmlApplicationContext; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerConfiguration.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerConfiguration.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerConfiguration.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -3,8 +3,8 @@ import org.jbpm.ExecutionService; import org.jbpm.ManagementService; import org.jbpm.ProcessService; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; /** * @author Pascal Verdage @@ -40,7 +40,7 @@ private synchronized static void initialize() { if (!isInitialized) { isInitialized = true; - environmentFactory = new PvmEnvironmentFactory("org/jbpm/pvm/timer/environment.cfg.xml"); + environmentFactory = new JbpmConfiguration("org/jbpm/pvm/timer/environment.cfg.xml"); processService = environmentFactory.get(ProcessService.class); executionService = environmentFactory.get(ExecutionService.class); managementService = environmentFactory.get(ManagementService.class); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -29,9 +29,9 @@ import org.hibernate.Session; import org.jbpm.PvmException; +import org.jbpm.cmd.Command; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.Transaction; -import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.model.CommentImpl; import org.jbpm.pvm.internal.type.variable.StringVariable; import org.jbpm.test.DbTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -53,7 +53,7 @@ processDefinition.setVersion(3); processDefinition.setDeploymentTime(deploymentTime); - processDefinition = reload(processDefinition); // / new transaction //////////////////////////// + processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); // / new transaction //////////////////////////// assertEquals("name", processDefinition.getName()); assertEquals("description", processDefinition.getDescription()); @@ -65,7 +65,7 @@ { OpenProcessDefinition processDefinition = ProcessFactory.build().node("a").initial().node("b").node("c").done(); - processDefinition = reload(processDefinition); // / new transaction //////////////////////////// + processDefinition = reload(processDefinition, OpenProcessDefinition.class); // / new transaction //////////////////////////// assertNotNull(processDefinition); List<Node> nodes = processDefinition.getNodes(); @@ -90,7 +90,7 @@ { OpenProcessDefinition processDefinition = ProcessFactory.build().node("a").initial().node("b").node("c").done(); - processDefinition = reload(processDefinition); // / new transaction //////////////////////////// + processDefinition = reload(processDefinition, OpenProcessDefinition.class); // / new transaction //////////////////////////// Node initial = processDefinition.getInitial(); assertNotNull(initial); @@ -109,14 +109,14 @@ OpenProcessDefinition processDefinition = ProcessFactory.build().compositeNode("top").initial().node("a").compositeNode("b").node("b1") .node("b2").node("b3").compositeEnd().node("c").compositeEnd().done(); - processDefinition = reload(processDefinition); // / new transaction //////////////////////////// + processDefinition = reload(processDefinition, OpenProcessDefinition.class); // / new transaction //////////////////////////// assertNotNull(processDefinition); Node initial = processDefinition.getInitial(); assertNotNull(initial); assertEquals(initial, processDefinition.getNode("top")); - processDefinition = reload(processDefinition); // / new transaction //////////////////////////// + processDefinition = reload(processDefinition, OpenProcessDefinition.class); // / new transaction //////////////////////////// List<Node> nodes = processDefinition.getNodes(); assertNotNull(nodes); @@ -138,7 +138,7 @@ assertEquals("b2", nodes.get(1).getName()); assertEquals("b3", nodes.get(2).getName()); - processDefinition = reload(processDefinition); // / new transaction //////////////////////////// + processDefinition = reload(processDefinition, OpenProcessDefinition.class); // / new transaction //////////////////////////// Node node = processDefinition.findNode("b2"); assertNotNull(node); @@ -154,7 +154,7 @@ .transition("toc").to("c").node("b").transition("toa").to("a").transition().to("b").transition("toc").to("c").node("c") .transition().to("c").node("d").done(); - processDefinition = reload(processDefinition); // / new transaction //////////////////////////// + processDefinition = reload(processDefinition, OpenProcessDefinition.class); // / new transaction //////////////////////////// assertEquals("a", processDefinition.getNode("a").getDefaultTransition().getDestination().getName()); assertEquals("a", processDefinition.getNode("b").getDefaultTransition().getDestination().getName()); @@ -169,7 +169,7 @@ OpenProcessDefinition processDefinition = ProcessFactory.build().node().initial().transition().to("a").transition().to("b").node("a") .node("b").done(); - processDefinition = reload(processDefinition); // / new transaction //////////////////////////// + processDefinition = reload(processDefinition, OpenProcessDefinition.class); // / new transaction //////////////////////////// assertNotNull(processDefinition); Node node = processDefinition.getInitial(); @@ -205,7 +205,7 @@ ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl)ProcessFactory.build().event(Event.PROCESS_BEGIN).listener("one") .listener("two").event(Event.PROCESS_END).listener("three").listener("four").node().initial().done(); - processDefinition = reload(processDefinition); // / new transaction //////////////////////////// + processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); // / new transaction //////////////////////////// EventImpl event = processDefinition.getEvent(Event.PROCESS_BEGIN); List<EventListenerReference> listenerReferences = event.getListenerReferences(); @@ -223,7 +223,7 @@ ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl)ProcessFactory.build().node("a").initial().event(Event.NODE_BEGIN) .listener("one").listener("two").event(Event.NODE_END).listener("three").listener("four").done(); - processDefinition = reload(processDefinition); // / new transaction //////////////////////////// + processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); // / new transaction //////////////////////////// EventImpl event = processDefinition.getNode("a").getEvent(Event.NODE_BEGIN); List<EventListenerReference> listenerReferences = event.getListenerReferences(); @@ -241,7 +241,7 @@ ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl)ProcessFactory.build().node("a").initial().transition().to("b") .listener("one").listener("two").node("b").done(); - processDefinition = reload(processDefinition); // / new transaction //////////////////////////// + processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); // / new transaction //////////////////////////// EventImpl event = processDefinition.getNode("a").getDefaultTransition().getEvent(); List<EventListenerReference> listenerReferences = event.getListenerReferences(); @@ -255,7 +255,7 @@ .exceptionHandler(IllegalArgumentException.class).listener("one").listener("two").exceptionHandlerEnd().exceptionHandler( RuntimeException.class).listener("three").listener("four").exceptionHandlerEnd().node().initial().done(); - processDefinition = reload(processDefinition); // / new transaction //////////////////////////// + processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); // / new transaction //////////////////////////// List<ExceptionHandlerImpl> exceptionHandlers = processDefinition.getExceptionHandlers(); @@ -276,7 +276,7 @@ IllegalArgumentException.class).listener("one").listener("two").exceptionHandlerEnd().exceptionHandler(RuntimeException.class) .listener("three").listener("four").exceptionHandlerEnd().done(); - processDefinition = reload(processDefinition); // / new transaction //////////////////////////// + processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); // / new transaction //////////////////////////// List<ExceptionHandlerImpl> exceptionHandlers = processDefinition.getNode("a").getExceptionHandlers(); @@ -296,7 +296,7 @@ ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl)ProcessFactory.build().property("key1", "val1").property("key2", "val2").node().initial().done(); - processDefinition = reload(processDefinition); // / new transaction //////////////////////////// + processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); // / new transaction //////////////////////////// assertEquals("val1", processDefinition.getProperty("key1")); assertEquals("val2", processDefinition.getProperty("key2")); @@ -307,7 +307,7 @@ ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl)ProcessFactory.build().node().initial().property("key1", "val1") .property("key2", "val2").done(); - processDefinition = reload(processDefinition); // / new transaction //////////////////////////// + processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); // / new transaction //////////////////////////// Node node = processDefinition.getInitial(); assertEquals("val1", node.getProperty("key1")); @@ -319,7 +319,7 @@ ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl)ProcessFactory.build().node("a").initial().transition().to("a") .property("key1", "val1").property("key2", "val2").done(); - processDefinition = reload(processDefinition); // / new transaction //////////////////////////// + processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); // / new transaction //////////////////////////// Transition transition = processDefinition.getInitial().getDefaultTransition(); assertEquals("val1", transition.getProperty("key1")); @@ -331,7 +331,7 @@ ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl)ProcessFactory.build().event(Event.PROCESS_BEGIN).property("key1", "val1").property("key2", "val2").node().initial().done(); - processDefinition = reload(processDefinition); // / new transaction //////////////////////////// + processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); // / new transaction //////////////////////////// EventImpl event = processDefinition.getEvent(Event.PROCESS_BEGIN); assertEquals("val1", event.getProperty("key1")); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessExecutionDbTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessExecutionDbTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessExecutionDbTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -37,7 +37,7 @@ { OpenProcessDefinition processDefinition = new ProcessDefinitionImpl(); - processDefinition = reload(processDefinition); // new transaction ///////// + processDefinition = reload(processDefinition, OpenProcessDefinition.class); // new transaction ///////// ExecutionImpl execution = new ExecutionImpl(); execution.setKey("businessKey"); @@ -45,7 +45,7 @@ execution.setState("test"); execution.setPriority(42); - execution = reload(execution); // new transaction ///////////////////////// + execution = reload(execution, ExecutionImpl.class); // new transaction ///////////////////////// assertNotNull(execution); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/type/VariableCustomTypeTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/type/VariableCustomTypeTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/type/VariableCustomTypeTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -79,7 +79,7 @@ ExecutionImpl execution = (ExecutionImpl)clientProcessDefinition.startProcessInstance(); - execution = reload(execution); + execution = reload(execution, ExecutionImpl.class); Calendar calendar = new GregorianCalendar(); calendar.set(Calendar.YEAR, 2007); @@ -92,7 +92,7 @@ execution.setVariable("v", calendar.getTime()); - execution = reload(execution); + execution = reload(execution, ExecutionImpl.class); Variable variable = execution.getVariableObject("v"); assertEquals(DateVariable.class, variable.getClass()); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,10 +21,10 @@ */ package org.jbpm.pvm.internal.expr; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.pvm.client.ClientExecution; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; import org.jbpm.pvm.internal.script.ScriptManager; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.pvm.samples.activities.WaitState; @@ -41,7 +41,7 @@ } public void dontTestGroovyExpression() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory>" + " <script-manager default-expression-language='juel'" + Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,10 +21,10 @@ */ package org.jbpm.pvm.internal.expr; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.pvm.client.ClientExecution; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; import org.jbpm.pvm.internal.script.ScriptManager; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.pvm.samples.activities.WaitState; @@ -37,7 +37,7 @@ public class JuelExpressionTest extends JbpmTestCase { public void testJuelExpression() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory>" + " <script-manager default-expression-language='juel'" + Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveTestCommand.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveTestCommand.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/ExclusiveTestCommand.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -27,9 +27,9 @@ import java.util.Set; import org.hibernate.Session; +import org.jbpm.cmd.Command; import org.jbpm.log.Log; import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.wire.descriptor.LongDescriptor; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailOnceTestCommand.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailOnceTestCommand.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailOnceTestCommand.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.internal.jobexecutor; +import org.jbpm.cmd.Command; import org.jbpm.log.Log; import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.model.CommentImpl; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailingTestCommand.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailingTestCommand.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/FailingTestCommand.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.jobexecutor; +import org.jbpm.cmd.Command; import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.model.CommentImpl; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.jobexecutor; +import org.jbpm.cmd.Command; import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -16,10 +16,10 @@ import java.util.ArrayList; import java.util.List; +import org.jbpm.cmd.Command; import org.jbpm.job.Message; import org.jbpm.log.Log; import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; import org.jbpm.pvm.session.MessageSession; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -33,6 +33,7 @@ import org.hibernate.Session; import org.jbpm.ProcessService; +import org.jbpm.cmd.Command; import org.jbpm.job.Job; import org.jbpm.log.Log; import org.jbpm.pvm.DeploymentImpl; @@ -42,7 +43,6 @@ import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.client.ClientExecution; import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.job.JobImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/TestMessageCommand.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/TestMessageCommand.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/TestMessageCommand.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -24,9 +24,9 @@ import java.util.List; import java.util.Random; +import org.jbpm.cmd.Command; import org.jbpm.log.Log; import org.jbpm.pvm.env.Environment; -import org.jbpm.pvm.internal.cmd.Command; import org.jbpm.pvm.internal.job.CommandMessage; import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -22,10 +22,10 @@ package org.jbpm.pvm.internal.wire; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.pvm.env.Context; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; import org.jbpm.pvm.internal.wire.Descriptor; import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.pvm.internal.wire.WireDefinition; @@ -76,7 +76,7 @@ // <subscribe /> will use the scope as the observable // In this test, there is no eager initialization - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory />" + " <environment>" + @@ -126,7 +126,7 @@ // <subscribe /> will use the scope as the observable // In this test, there is eager initialisation - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory />" + " <environment>" + @@ -160,7 +160,7 @@ // <subscribe /> will use the scope as the observable // In this test, there is eager initialisation - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory />" + " <environment>" + @@ -201,7 +201,7 @@ // <subscribe event='...' /> will use the scope as the observable and only notify on the specified event // In this test, there is eager initialisation - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory />" + " <environment>" + @@ -237,7 +237,7 @@ // <subscribe event='...' /> will use the scope as the observable and only notify on the specified event // In this test, there is eager initialisation - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory />" + " <environment>" + @@ -284,7 +284,7 @@ // <subscribe event='...' /> will use the scope as the observable and only notify on the specified event // In this test, there is eager initialisation - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory />" + " <environment>" + @@ -320,7 +320,7 @@ } public void testOtherWireScope() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory>" + " <object name='factory' class='"+Object.class.getName()+"' />" + @@ -363,14 +363,14 @@ index++; assertEquals("close", events.get(index).eventName); - PvmEnvironmentFactory pvmEnvironmentFactory = (PvmEnvironmentFactory) environmentFactory; - WireContext applicationWireContext = pvmEnvironmentFactory.getEnvironmentFactoryCtxWireContext(); + JbpmConfiguration jbpmConfiguration = (JbpmConfiguration) environmentFactory; + WireContext applicationWireContext = jbpmConfiguration.getEnvironmentFactoryCtxWireContext(); assertEquals(applicationWireContext, events.get(index).source); assertNull(events.get(index).info); } public void testOtherWireScopeWithEventFiltering() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory>" + " <object name='factory' class='"+Object.class.getName()+"' />" + @@ -408,7 +408,7 @@ } public void testUnexistingScope() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory />" + " <environment>" + @@ -437,7 +437,7 @@ // <subscribe /> will use the scope as the observable // In this test, there is no eager initialization - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory />" + " <environment>" + @@ -496,7 +496,7 @@ // <subscribe /> will use the scope as the observable // In this test, there is no eager initialization - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory />" + " <environment>" + Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -16,9 +16,9 @@ import java.util.HashSet; import java.util.Set; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; import org.jbpm.pvm.internal.wire.WireContext; /** @@ -149,7 +149,7 @@ } public void testHasOnEmptyEnv(){ - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes/>" ); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -1,8 +1,8 @@ package org.jbpm.pvm.internal.wire; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; import org.jbpm.pvm.internal.wire.WireContext; /** @@ -12,7 +12,7 @@ public class EnvWireTest extends WireTestCase { public void testEnvironmentWire(){ - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + @@ -36,7 +36,7 @@ } public void testEnvironmentFactoryWire(){ - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + @@ -59,7 +59,7 @@ } public void testContextRefEnvironmentWire(){ - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + @@ -83,7 +83,7 @@ } public void testContextRefEnvironmentFactoryWire(){ - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory>" + " <context-ref name='c' />" + Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -1,8 +1,8 @@ package org.jbpm.pvm.internal.wire; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; import org.jbpm.pvm.internal.util.DefaultObservable; import org.jbpm.pvm.internal.util.Observable; import org.jbpm.pvm.internal.wire.WireException; @@ -44,7 +44,7 @@ * The recorder is eagerly initialized. */ public void testMethodWithNoArg() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + @@ -86,7 +86,7 @@ * The recorder is eagerly initialized. */ public void testMethodWithBadName() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + @@ -123,7 +123,7 @@ * The recorder is eagerly initialized. */ public void testMethodWithOneArg() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + @@ -170,7 +170,7 @@ * The recorder is eagerly initialized. */ public void testMethodWithTwoArgs() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + @@ -230,7 +230,7 @@ * The recorder is eagerly initialized. */ public void testMethodWithThreeArgs() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + @@ -282,7 +282,7 @@ * Test subscription using a specified method and two objects. */ public void testMethodWithArgsAndMultipleObjectsSubcription() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + @@ -373,7 +373,7 @@ } public void testMethodAndOverLoading() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + @@ -428,7 +428,7 @@ } public void testMethodAndBadArg() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.internal.wire; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; import org.jbpm.pvm.internal.util.DefaultObservable; import org.jbpm.pvm.internal.util.Observable; import org.jbpm.pvm.internal.wire.WireException; @@ -38,7 +38,7 @@ // <subscribe object='...' /> will use the object as the observable // In this test, there is no eager initialisation - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + @@ -80,7 +80,7 @@ // <subscribe object='...' /> will use the object as the observable // In this test, there is eager initialisation - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + @@ -126,7 +126,7 @@ // <subscribe objects='...' /> will use the object as the observable // In this test, there is eager initialisation - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + @@ -193,7 +193,7 @@ } public void testUnexistingObject() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + @@ -216,7 +216,7 @@ // <subscribe object='...' /> will use the object as the observable // In this test, there is eager initialization - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + @@ -266,7 +266,7 @@ } public void testNotObservableObject() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + @@ -288,7 +288,7 @@ } public void testNotListener() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.internal.wire; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; import org.jbpm.pvm.internal.util.DefaultObservable; import org.jbpm.pvm.internal.util.Observable; import org.jbpm.pvm.internal.wire.WireObjectEventInfo; @@ -40,7 +40,7 @@ // class Descriptor public void testRegisterToAllDescriptors() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + @@ -82,7 +82,7 @@ } public void testOneObjectDescriptor() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + @@ -139,7 +139,7 @@ } public void testMultipleObjectDescriptors() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + @@ -215,7 +215,7 @@ } public void testOneObjectDescriptorWithEventFilter() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + @@ -256,7 +256,7 @@ } public void testMultipleObjectDescriptorsWithEventFilter() { - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -23,10 +23,10 @@ import java.util.List; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.pvm.env.Context; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; import org.jbpm.pvm.internal.util.Listener; import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.test.JbpmTestCase; @@ -46,7 +46,7 @@ // <subscribe /> will use the scope as the observable // In this test, there is no eager initialisation - EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + " <environment-factory />" + " <environment>" + Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ExamplesConfiguration.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ExamplesConfiguration.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ExamplesConfiguration.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -24,8 +24,8 @@ import org.jbpm.ExecutionService; import org.jbpm.ManagementService; import org.jbpm.ProcessService; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; /** @@ -62,7 +62,7 @@ private synchronized static void initialize() { if (!isInitialized) { isInitialized = true; - environmentFactory = new PvmEnvironmentFactory("environment.cfg.xml"); + environmentFactory = new JbpmConfiguration("environment.cfg.xml"); processService = environmentFactory.get(ProcessService.class); executionService = environmentFactory.get(ExecutionService.class); managementService = environmentFactory.get(ManagementService.class); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex13/EnvironmentTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex13/EnvironmentTest.java 2008-10-31 16:16:33 UTC (rev 2709) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex13/EnvironmentTest.java 2008-10-31 16:17:37 UTC (rev 2710) @@ -23,16 +23,16 @@ import junit.framework.TestCase; +import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; -import org.jbpm.pvm.env.PvmEnvironmentFactory; /** * @author Tom Baeyens */ public class EnvironmentTest extends TestCase { - static EnvironmentFactory environmentFactory = PvmEnvironmentFactory.parseXmlString( + static EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<contexts>" + " <environment-factory>" + " <object name='book' class='org.jbpm.pvm.samples.ex13.Book' />" +