[jbpm-commits] JBoss JBPM SVN: r1538 - in pvm/trunk/modules/core/src: main/java/org/jbpm/pvm/internal/env and 5 other directories.

Author: porcherg Date: 2008-07-08 03:59:44 -0400 (Tue, 08 Jul 2008) New Revision: 1538 Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/env/Context.java pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/env/Environment.java pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/env/PvmEnvironmentFactory.java pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/env/DefaultEnvironment.java pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/env/ExecutionContext.java pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/env/JobContext.java pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/env/WebRequestContext.java pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/env/WebSessionContext.java pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentContext.java pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentFactory.java pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnterpriseTransactionDescriptor.java pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentTypeRefDescriptor.java pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/StandardTransactionDescriptor.java pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring2/PojoEnvironment.java pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring2/SimpleContext.java pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring2/SpringPojoEnvironmentFactory.java pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring2/pvm-beans.xml Log: remove get/setEnvironment from Context (JBPM-1220) Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/env/Context.java =================================================================== --- pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/env/Context.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/env/Context.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -39,6 +39,4 @@ Object set(String key, Object value); Set<String> keys(); - /** invoked by the environment when this context is added. */ - void setEnvironment(Environment environment); } Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/env/Environment.java =================================================================== --- pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/env/Environment.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/env/Environment.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -159,9 +159,7 @@ public abstract Throwable getException(); /** - * closes the Environment by removing all its contexts. As a result of removing the - * contexts, the {@link Context#setEnvironment(Environment)} will be called with a - * null value for environment. + * closes the Environment by removing all its contexts. */ public abstract void close(); Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/env/PvmEnvironmentFactory.java =================================================================== --- pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/env/PvmEnvironmentFactory.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/env/PvmEnvironmentFactory.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -126,24 +126,27 @@ WireContext blockContext = new WireContext(blockWireDefinition, DefaultEnvironment.CONTEXTNAME_ENVIRONMENT, environment, true); // add the environment block context to the environment environment.addContext(blockContext); - // finish the creation of the environment wire context - blockContext.create(); - // fire an open environment event - applicationWireContext.fire(DefaultEnvironment.EVENT_OPENENVIRONMENT, environment); - - // if all went well, only then push the created environment + // push the created environment so that Environment.getCurrent() returns it + // This is required to construct some objects in blockContext Environment.pushEnvironment(environment); + + try { + // finish the creation of the environment wire context + blockContext.create(); + // fire an open environment event + applicationWireContext.fire(DefaultEnvironment.EVENT_OPENENVIRONMENT, environment); + + } catch (RuntimeException e) { + // On exception, pop environment + Environment.popEnvironment(); + throw e; + } + // if all went well, return the created environment return environment; } - public void setEnvironment(Environment environment) { - // this object is the environment factory and the environment-factory context, so - // it doesn't need to do anythings when the environment-factory context is added - // to the environment - } - public void close() { applicationWireContext.fire(WireContext.EVENT_CLOSE, null); } Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/env/DefaultEnvironment.java =================================================================== --- pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/env/DefaultEnvironment.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/env/DefaultEnvironment.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -86,7 +86,6 @@ public void addContext(Context context) { String key = context.getName(); contexts.put(key, context); - context.setEnvironment(this); defaultSearchOrderList.add(key); defaultSearchOrder = null; } Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/env/ExecutionContext.java =================================================================== --- pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/env/ExecutionContext.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/env/ExecutionContext.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -25,7 +25,6 @@ import org.jbpm.pvm.Execution; import org.jbpm.pvm.env.Context; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.model.ExecutionImpl; public class ExecutionContext implements Context { @@ -60,7 +59,4 @@ public <T> T get(Class<T> type) { return null; } - - public void setEnvironment(Environment environment) { - } } Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/env/JobContext.java =================================================================== --- pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/env/JobContext.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/env/JobContext.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -26,7 +26,6 @@ import java.util.Set; import org.jbpm.pvm.env.Context; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.job.JobImpl; public class JobContext implements Context { @@ -67,9 +66,6 @@ return null; } - public void setEnvironment(Environment environment) { - } - public String getName() { return null; } Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/env/WebRequestContext.java =================================================================== --- pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/env/WebRequestContext.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/env/WebRequestContext.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -55,9 +55,6 @@ return null; } - public void setEnvironment(Environment environment) { - } - public String getName() { return null; } Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/env/WebSessionContext.java =================================================================== --- pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/env/WebSessionContext.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/env/WebSessionContext.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -24,7 +24,6 @@ import java.util.Set; import org.jbpm.pvm.env.Context; -import org.jbpm.pvm.env.Environment; public class WebSessionContext implements Context { @@ -55,9 +54,6 @@ return null; } - public void setEnvironment(Environment environment) { - } - public String getName() { return null; } Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java =================================================================== --- pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironment.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -64,7 +64,6 @@ public void addContext(Context context) { String key = context.getName(); contexts.put(key, context); - context.setEnvironment(this); defaultSearchOrderList.add(key); defaultSearchOrder = null; } Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentContext.java =================================================================== --- pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentContext.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentContext.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -95,7 +95,4 @@ public Object set(String key, Object value) { return null; } - - public void setEnvironment(Environment environment) { - } } Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentFactory.java =================================================================== --- pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentFactory.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/spring/SpringEnvironmentFactory.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -24,12 +24,10 @@ import java.util.HashSet; import java.util.Set; -import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.env.EnvironmentFactory; import org.jbpm.pvm.internal.util.ReflectUtil; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; -import org.springframework.context.support.ClassPathXmlApplicationContext; /** this environment factory will see only the singleton beans. * @@ -96,7 +94,4 @@ public Object set(String key, Object value) { return null; } - - public void setEnvironment(Environment environment) { - } } Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java =================================================================== --- pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -206,7 +206,6 @@ // member fields //////////////////////////////////////////////////////////// protected String name = "wire-context"; - protected Environment environment; protected EnvironmentFactory environmentFactory; protected transient ClassLoader classLoader; protected WireDefinition wireDefinition; @@ -257,7 +256,6 @@ this.wireDefinition = wireDefinition; this.name = name; this.classLoader = (wireDefinition!=null ? wireDefinition.getClassLoader() : null); - this.environment = environment; if (environment!=null) { this.environmentFactory = environment.getEnvironmentFactory(); } @@ -302,16 +300,6 @@ } } - /** - * <p>invoked (with a non-null argument) by the environment when this context is added.</p> - * <p>When the context is removed from the environment, this method will be called again with the null value. - * In this case, the {@link #close()} method is called to close the context.</p> - * @see Context#setEnvironment(Environment) - */ - public void setEnvironment(Environment environment) { - this.environment = environment; - } - public String toString() { return (name!=null ? name : super.toString()); } @@ -436,6 +424,7 @@ } // then check if we can find it in the environment (if one is available) + Environment environment = Environment.getCurrent(); if (environment!=null) { log.trace("delivering "+objectName+" from environment"); return environment.get(objectName); @@ -747,9 +736,6 @@ public void setWireDefinition(WireDefinition wireDefinition) { this.wireDefinition = wireDefinition; } - public Environment getEnvironment() { - return environment; - } public EnvironmentFactory getEnvironmentFactory() { return environmentFactory; } Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnterpriseTransactionDescriptor.java =================================================================== --- pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnterpriseTransactionDescriptor.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnterpriseTransactionDescriptor.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -39,7 +39,7 @@ boolean manage; public Object construct(WireContext wireContext) { - Environment environment = wireContext.getEnvironment(); + Environment environment = Environment.getCurrent(); if (environment==null) { throw new WireException("enterprise transaction requires environment"); } Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java =================================================================== --- pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentDescriptor.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -1,5 +1,6 @@ package org.jbpm.pvm.internal.wire.descriptor; +import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.wire.Descriptor; import org.jbpm.pvm.internal.wire.WireContext; @@ -17,6 +18,6 @@ private static final long serialVersionUID = 1L; public Object construct(WireContext wireContext) { - return wireContext.getEnvironment(); + return Environment.getCurrent(); } } Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentTypeRefDescriptor.java =================================================================== --- pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentTypeRefDescriptor.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentTypeRefDescriptor.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -44,7 +44,7 @@ public Object construct(WireContext wireContext) { log.trace("looking up "+type+" by type in environment"); if (type!=null) { - Environment environment = wireContext.getEnvironment(); + Environment environment = Environment.getCurrent(); if (environment==null) { throw new WireException("no environment to search an object of type "+type.getName()); } Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java =================================================================== --- pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/HibernateSessionDescriptor.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -55,7 +55,7 @@ if (factoryName!=null) { sessionFactory = (SessionFactory) wireContext.get(factoryName); } else { - Environment environment = wireContext.getEnvironment(); + Environment environment = Environment.getCurrent(); if (environment!=null) { sessionFactory = environment.get(SessionFactory.class); } else { Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java =================================================================== --- pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -8,6 +8,7 @@ import java.util.List; import org.jbpm.pvm.PvmException; +import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.log.Log; import org.jbpm.pvm.internal.util.ArrayUtil; import org.jbpm.pvm.internal.util.ReflectUtil; @@ -269,7 +270,7 @@ Object autoWireValue = null; if ("environment".equals(fieldName)) { - autoWireValue = wireContext.getEnvironment(); + autoWireValue = Environment.getCurrent(); } else if ( ("context".equals(fieldName)) || ("wireContext".equals(fieldName)) @@ -277,7 +278,7 @@ autoWireValue = wireContext; } else if ("environmentFactory".equals(fieldName)) { - autoWireValue = wireContext.getEnvironment().getEnvironmentFactory(); + autoWireValue = Environment.getCurrent().getEnvironmentFactory(); } else if (wireContext.has(fieldName)) { autoWireValue = wireContext.get(fieldName); Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/StandardTransactionDescriptor.java =================================================================== --- pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/StandardTransactionDescriptor.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/descriptor/StandardTransactionDescriptor.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -36,7 +36,7 @@ public Object construct(WireContext wireContext) { StandardTransaction standardTransaction = new StandardTransaction(); - Environment environment = wireContext.getEnvironment(); + Environment environment = Environment.getCurrent(); if (environment==null) { throw new WireException("standard transaction requires environment"); } Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java =================================================================== --- pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/operation/EnlistOperation.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -42,7 +42,7 @@ if (transactionName!=null) { object = wireContext.get(transactionName); } else { - object = wireContext.getEnvironment().get(Transaction.class); + object = wireContext.get(Transaction.class); } if ( (object==null) Modified: pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java =================================================================== --- pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/operation/SubscribeOperation.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -77,7 +77,7 @@ // identify the wireContext WireContext wireContext = null; if (contextName!=null) { - Environment environment = targetWireContext.getEnvironment(); + Environment environment = Environment.getCurrent(); if (environment!=null) { try { wireContext = (WireContext) environment.getContext(contextName); Modified: pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring2/PojoEnvironment.java =================================================================== --- pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring2/PojoEnvironment.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring2/PojoEnvironment.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -21,7 +21,6 @@ */ package org.jbpm.pvm.spring2; -import java.util.Arrays; import java.util.Map; import org.jbpm.pvm.env.Context; Modified: pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring2/SimpleContext.java =================================================================== --- pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring2/SimpleContext.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring2/SimpleContext.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -37,7 +37,6 @@ private Map<String, Object> internalContext; private Map<Class, Object> internalContextByClass; private String name; - private Environment environment; public Object get(String key) { return getInternalContext().get(key); @@ -63,10 +62,6 @@ getInternalContextByClass().put(value.getClass(), value); return getInternalContext().put(key, value); } - - public void setEnvironment(Environment environment) { - this.environment = environment; - } public void setName(String name) { this.name = name; @@ -95,7 +90,4 @@ return internalContextByClass; } - public Environment getEnvironment() { - return environment; - } } Modified: pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring2/SpringPojoEnvironmentFactory.java =================================================================== --- pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring2/SpringPojoEnvironmentFactory.java 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring2/SpringPojoEnvironmentFactory.java 2008-07-08 07:59:44 UTC (rev 1538) @@ -51,9 +51,6 @@ return environment; } - public void setEnvironment(Environment environment) { - } - public String getName() { return null; } Modified: pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring2/pvm-beans.xml =================================================================== --- pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring2/pvm-beans.xml 2008-07-08 07:50:10 UTC (rev 1537) +++ pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/spring2/pvm-beans.xml 2008-07-08 07:59:44 UTC (rev 1538) @@ -4,7 +4,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> - <bean id="environment" class="org.jbpm.pvm.internal.spring2.PojoEnvironment"> + <bean id="environment" class="org.jbpm.pvm.spring2.PojoEnvironment"> <property name="contexts"> <map> <entry key="environment-block" value-ref="environmentContext"/> @@ -12,7 +12,7 @@ </property> </bean> - <bean id="environmentContext" class="org.jbpm.pvm.internal.spring2.PersistenceSimpleContext"> + <bean id="environmentContext" class="org.jbpm.pvm.spring2.PersistenceSimpleContext"> <property name="sessionFactory" ref="hibernateSessionFactory"/> </bean>