[jbpm-commits] JBoss JBPM SVN: r5978 - in jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/spring: transactionmanager and 1 other directory.

[do-not-reply at jboss.org]

Author: jbarrez
Date: 2009-12-17 06:24:30 -0500 (Thu, 17 Dec 2009)
New Revision: 5978

Modified:
   jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/spring/expression/eventlistener/applicationContext.xml
   jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/spring/transactionmanager/applicationContext.xml
   jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/spring/transactionmanager/jbpm.cfg.xml
Log:
Fixing test-cfg for Spring

Modified: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/spring/expression/eventlistener/applicationContext.xml
===================================================================
--- jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/spring/expression/eventlistener/applicationContext.xml	2009-12-17 11:06:19 UTC (rev 5977)
+++ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/spring/expression/eventlistener/applicationContext.xml	2009-12-17 11:24:30 UTC (rev 5978)
@@ -14,11 +14,11 @@
 
   <bean id="myEventListener" class="org.jbpm.test.spring.expression.eventlistener.MyEventListener" />
  
-  <bean id="jbpmConfiguration" class="org.jbpm.pvm.internal.cfg.SpringConfiguration">
-      <property name="jbpmCfgLocation" value="org/jbpm/test/spring/expression/eventlistener/jbpm.cfg.xml" />
+  <bean id="springHelper" class="org.jbpm.pvm.internal.processengine.SpringHelper">
+      <property name="jbpmCfg" value="org/jbpm/test/spring/expression/eventlistener/jbpm.cfg.xml" />
   </bean>
   
-  <bean id="processEngine" factory-bean="jbpmConfiguration" factory-method="buildProcessEngine" />
+  <bean id="processEngine" factory-bean="springHelper" factory-method="createProcessEngine" />
 
 	<bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
 		<property name="configLocation" value="classpath:org/jbpm/test/spring/transactionmanager/jbpm.hibernate.cfg.xml" />

Modified: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/spring/transactionmanager/applicationContext.xml
===================================================================
--- jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/spring/transactionmanager/applicationContext.xml	2009-12-17 11:06:19 UTC (rev 5977)
+++ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/spring/transactionmanager/applicationContext.xml	2009-12-17 11:24:30 UTC (rev 5978)
@@ -11,11 +11,11 @@
           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
           http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
 
-  <bean id="jbpmConfiguration" class="org.jbpm.pvm.internal.cfg.SpringConfiguration">
-     <property name="jbpmCfgLocation" value="org/jbpm/test/spring/transactionmanager/jbpm.cfg.xml" />
+   <bean id="springHelper" class="org.jbpm.pvm.internal.processengine.SpringHelper">
+      <property name="jbpmCfg" value="org/jbpm/test/spring/transactionmanager/jbpm.cfg.xml" />
   </bean>
   
-  <bean id="processEngine" factory-bean="jbpmConfiguration" factory-method="buildProcessEngine" />
+  <bean id="processEngine" factory-bean="springHelper" factory-method="createProcessEngine" />
 
 	<bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
 		<property name="configLocation" value="classpath:org/jbpm/test/spring/transactionmanager/jbpm.hibernate.cfg.xml" />

Modified: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/spring/transactionmanager/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/spring/transactionmanager/jbpm.cfg.xml	2009-12-17 11:06:19 UTC (rev 5977)
+++ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/spring/transactionmanager/jbpm.cfg.xml	2009-12-17 11:24:30 UTC (rev 5978)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<jbpm-configuration>
+<jbpm-configuration spring="enabled">
 
 	<import resource="jbpm.default.cfg.xml" />
 	<import resource="jbpm.jpdl.cfg.xml" />
@@ -15,7 +15,7 @@
 		<command-service name="newTxRequiredCommandService">
 			<retry-interceptor />
 			<environment-interceptor policy="requiresNew" />
-			<spring-transaction-interceptor transaction-manager="someOtherTransactionManager"/>
+			<spring-transaction-interceptor transaction-manager="someOtherTransactionManager" policy="requiresNew" />
 		</command-service>
 
 		<command-service name="txRequiredCommandService">
@@ -26,9 +26,9 @@
 
 	</process-engine-context>
 
-	<transaction-context>
-		<transaction />
-		<hibernate-session />
-	</transaction-context>
+	 <transaction-context>
+    <transaction type="spring" />
+    <hibernate-session current="true" />
+  </transaction-context>
 
 </jbpm-configuration>