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

Author: tom.baeyens(a)jboss.com Date: 2009-01-16 05:30:08 -0500 (Fri, 16 Jan 2009) New Revision: 3661 Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java Removed: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/job/ Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.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/jobexecutor/JobExecutorServlet.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/wire/WireContext.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobTestHelperBinding.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentClassLoaderTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.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/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/resources/org/jbpm/pvm/spring/spring.beans.xml Log: renamed package org.jbpm.cfg to org.jbpm.pvm.internal.cfg Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/Configuration.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -59,11 +59,11 @@ if (implementationClassNames==null) { implementationClassNames = new HashMap<String, String>(); // null represents the default configuration (== the JbpmConfiguration) - implementationClassNames.put(null, "org.jbpm.cfg.JbpmConfiguration"); + implementationClassNames.put(null, "org.jbpm.pvm.internal.cfg.JbpmConfiguration"); // TODO - // implementationClasses.put("spring", "org.jbpm.cfg.SpringConfiguration"); - // implementationClasses.put("mc", "org.jbpm.cfg.McConfiguration"); - // implementationClasses.put("programatic", "org.jbpm.cfg.ProgramaticConfiguration"); + // implementationClasses.put("spring", "org.jbpm.pvm.internal.cfg.SpringConfiguration"); + // implementationClasses.put("mc", "org.jbpm.pvm.internal.cfg.McConfiguration"); + // implementationClasses.put("programatic", "org.jbpm.pvm.internal.cfg.ProgramaticConfiguration"); } String implementationClassName = implementationClassNames.get(type); if (implementationClassName==null) { Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java (from rev 3641, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -0,0 +1,258 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.cfg; + +import java.io.File; +import java.io.InputStream; +import java.net.URL; +import java.util.Map; +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.TaskService; +import org.jbpm.env.Context; +import org.jbpm.env.Environment; +import org.jbpm.env.EnvironmentFactory; +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.FileStreamInput; +import org.jbpm.pvm.internal.stream.InputStreamInput; +import org.jbpm.pvm.internal.stream.ResourceStreamInput; +import org.jbpm.pvm.internal.stream.StreamInput; +import org.jbpm.pvm.internal.stream.StringStreamInput; +import org.jbpm.pvm.internal.stream.UrlStreamInput; +import org.jbpm.pvm.internal.wire.WireContext; +import org.jbpm.pvm.internal.wire.WireDefinition; + +/** + * an environment factory that also is the process-engine context. + * + * <p> + * This environment factory will produce environments with 2 contexts: the + * process-engine context and the block context. + * </p> + * + * <p> + * An process-engine context is build from two wire definitions: the + * process-engine wire definition and the environment wire definition. + * </p> + * + * <p> + * The process-engine context itself is build from the process-engine + * wire definition. So all objects that are created in this context remain + * cached for the lifetime of this process-engine context object. + * </p> + * + * <p> + * This process-engine context is also a environment factory. The produced + * environments contain 2 contexts: the process-engine 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() { + super((Configuration)null); + } + + public ProcessEngine buildProcessEngine() { + if (!isConfigured) { + setResource("jbpm.cfg.xml"); + } + return this; + } + + public Configuration setInputStream(InputStream inputStream) { + parse(new InputStreamInput(inputStream)); + return this; + } + + public Configuration setResource(String resource) { + parse(new ResourceStreamInput(resource, getClassLoader())); + return this; + } + + public Configuration setUrl(URL url) { + parse(new UrlStreamInput(url)); + return this; + } + + public Configuration setFile(File file) { + parse(new FileStreamInput(file)); + return this; + } + + public Configuration setXmlString(String xmlString) { + parse(new StringStreamInput(xmlString)); + return this; + } + + protected void parse(StreamInput streamSource) { + isConfigured = true; + PvmEnvironmentFactoryParser.getInstance() + .createParse() + .setDocumentObject(this) + .setStreamSource(streamSource) + .execute() + .checkProblems("jbpm configuration " + streamSource); + } + + public ExecutionService getExecutionService() { + return environmentFactoryCtxWireContext.get(ExecutionService.class); + } + + public ExecutionService getExecutionService(Map<String, Object> txResources) { + // TODO Auto-generated method stub + return null; + } + + public ManagementService getManagementService() { + return environmentFactoryCtxWireContext.get(ManagementService.class); + } + + public ManagementService getManagementService(Map<String, Object> txResources) { + // TODO Auto-generated method stub + return null; + } + + public ProcessService getProcessService() { + return environmentFactoryCtxWireContext.get(ProcessService.class); + } + + public ProcessService getProcessService(Map<String, Object> txResources) { + // TODO Auto-generated method stub + return null; + } + + public TaskService getTaskService() { + return environmentFactoryCtxWireContext.get(TaskService.class); + } + + public TaskService getTaskService(Map<String, Object> txResources) { + // TODO Auto-generated method stub + 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 process-engine 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); + + Environment.pushEnvironment(environment); + try { + // finish the creation of the environment wire context + environmentContext.create(); + + } catch (RuntimeException e) { + Environment.popEnvironment(); + throw e; + } + + // if all went well, return the created environment + return environment; + } + + public void close() { + environmentFactoryCtxWireContext.fire(WireContext.EVENT_CLOSE, null); + } + + // process-engine 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/pvm/internal/cfg/SpringConfiguration.java (from rev 3641, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/SpringConfiguration.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/SpringConfiguration.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -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.pvm.internal.cfg; + +import java.util.HashSet; +import java.util.Set; + +import org.jbpm.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 implements EnvironmentFactory, 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/env/PvmEnvironment.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironment.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.internal.env; -import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.env.Context; import org.jbpm.log.Log; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.util.Closable; 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 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.internal.env; -import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.env.Context; import org.jbpm.env.EnvironmentFactory; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.stream.StreamInput; import org.jbpm.pvm.internal.util.XmlUtil; import org.jbpm.pvm.internal.wire.WireContext; 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 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorServlet.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -31,8 +31,8 @@ import org.jbpm.Configuration; import org.jbpm.JbpmException; -import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.env.EnvironmentFactory; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; /** * starts the job executor on init and closes the 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 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -21,8 +21,8 @@ */ package org.jbpm.pvm.internal.spring; -import org.jbpm.cfg.SpringConfiguration; import org.jbpm.env.EnvironmentFactory; +import org.jbpm.pvm.internal.cfg.SpringConfiguration; import org.jbpm.pvm.internal.env.BasicEnvironment; import org.springframework.context.ApplicationContext; Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java (from rev 3641, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/job/JobTestHelper.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -0,0 +1,85 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.test; + +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.env.Environment; +import org.jbpm.job.Job; +import org.jbpm.pvm.internal.job.MessageImpl; +import org.jbpm.pvm.internal.job.TimerImpl; +import org.jbpm.pvm.internal.jobexecutor.ExecuteJobCmd; + + +/** helper class for testing that executes messages and timers + * in the test runner thread. This way, the test can simulate + * timers and messages being executed. The dueDate is ignored. + * + * @author Tom Baeyens + */ +public class JobTestHelper { + + CommandService commandService; + + public Execution executeMessage(final long executionDbid) { + return commandService.execute(new Command<Execution>() { + private static final long serialVersionUID = 1L; + public Execution execute(Environment environment) throws Exception { + Session session = environment.get(Session.class); + Query query = session.createQuery( + "select m.dbid " + + "from "+MessageImpl.class.getName()+" as m " + + "where m.execution.dbid = :executionDbid" + ); + query.setLong("executionDbid", executionDbid); + query.setMaxResults(1); + Long messageDbid = (Long) query.uniqueResult(); + ExecuteJobCmd executeJobCommand = new ExecuteJobCmd(messageDbid); + Job job = executeJobCommand.execute(environment); + return job.getExecution(); + } + }); + } + + public Execution executeTimer(final long timerDbid) { + return commandService.execute(new Command<Execution>() { + private static final long serialVersionUID = 1L; + public Execution execute(Environment environment) throws Exception { + Session session = environment.get(Session.class); + Query query = session.createQuery( + "select t.dbid " + + "from "+TimerImpl.class.getName()+" as t " + + "where t.dbid = :timerDbid" + ); + query.setLong("timerDbid", timerDbid); + query.setMaxResults(1); + Long timerDbid = (Long) query.uniqueResult(); + ExecuteJobCmd executeJobCommand = new ExecuteJobCmd(timerDbid); + Job job = executeJobCommand.execute(environment); + return job.getExecution(); + } + }); + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/test/JobTestHelper.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF 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 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -30,11 +30,11 @@ import java.util.Set; import org.jbpm.activity.Activity; -import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.env.Context; import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; import org.jbpm.log.Log; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.model.ProcessElementImpl; import org.jbpm.pvm.internal.util.Closable; import org.jbpm.pvm.internal.util.DefaultObservable; 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 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobTestHelperBinding.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -22,7 +22,7 @@ package org.jbpm.pvm.internal.wire.binding; import org.jbpm.cmd.CommandService; -import org.jbpm.job.JobTestHelper; +import org.jbpm.pvm.internal.test.JobTestHelper; 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/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -21,10 +21,10 @@ */ package org.jbpm.pvm.env; -import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.env.Context; import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.test.JbpmTestCase; /** Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentClassLoaderTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentClassLoaderTest.java 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentClassLoaderTest.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.env; -import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.test.JbpmTestCase; /** Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.env; -import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.pvm.internal.wire.WireDefinition; import org.jbpm.pvm.internal.wire.xml.WireParser; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.env; -import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.test.JbpmTestCase; /** Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.env; -import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.test.JbpmTestCase; /** 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 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -21,11 +21,11 @@ */ package org.jbpm.pvm.internal.expr; -import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.client.ClientExecution; import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.activities.WaitState; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.script.ScriptManager; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; 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 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -21,11 +21,11 @@ */ package org.jbpm.pvm.internal.expr; -import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.client.ClientExecution; import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; import org.jbpm.pvm.activities.WaitState; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.script.ScriptManager; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; 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 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -22,10 +22,10 @@ package org.jbpm.pvm.internal.wire; -import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.env.Context; import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.wire.Descriptor; import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.pvm.internal.wire.WireDefinition; 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 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextTest.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -16,9 +16,9 @@ import java.util.HashSet; import java.util.Set; -import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.wire.WireContext; /** 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 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -1,8 +1,8 @@ package org.jbpm.pvm.internal.wire; -import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.wire.WireContext; /** 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 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -1,8 +1,8 @@ package org.jbpm.pvm.internal.wire; -import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.util.DefaultObservable; import org.jbpm.pvm.internal.util.Observable; import org.jbpm.pvm.internal.wire.WireException; 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 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.internal.wire; -import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.util.DefaultObservable; import org.jbpm.pvm.internal.util.Observable; import org.jbpm.pvm.internal.wire.WireException; 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 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -21,9 +21,9 @@ */ package org.jbpm.pvm.internal.wire; -import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.util.DefaultObservable; import org.jbpm.pvm.internal.util.Observable; import org.jbpm.pvm.internal.wire.WireObjectEventInfo; 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 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2009-01-16 10:30:08 UTC (rev 3661) @@ -23,10 +23,10 @@ import java.util.List; -import org.jbpm.cfg.JbpmConfiguration; import org.jbpm.env.Context; import org.jbpm.env.Environment; import org.jbpm.env.EnvironmentFactory; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.util.Listener; import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.test.JbpmTestCase; Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/spring/spring.beans.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/spring/spring.beans.xml 2009-01-16 10:11:21 UTC (rev 3660) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/spring/spring.beans.xml 2009-01-16 10:30:08 UTC (rev 3661) @@ -28,7 +28,7 @@ </bean> <bean id="environmentFactory" - class="org.jbpm.cfg.SpringConfiguration" + class="org.jbpm.pvm.internal.cfg.SpringConfiguration" scope="singleton" /> <bean id="sessionFactory"