[jbpm-commits] JBoss JBPM SVN: r4135 - in jbpm4/branches/ainze: modules/spring and 2 other directories.

[do-not-reply at jboss.org]

Author: ainze
Date: 2009-03-04 09:08:34 -0500 (Wed, 04 Mar 2009)
New Revision: 4135

Modified:
   jbpm4/branches/ainze/modules/spring/pom.xml
   jbpm4/branches/ainze/modules/spring/src/main/java/org/jbpm/spring/test/AbstractTransactionalSpringJbpmTestCase.java
   jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/activities/ExclusiveTest.java
   jbpm4/branches/ainze/pom.xml
Log:
added spring 2.0.8 compatibility

Modified: jbpm4/branches/ainze/modules/spring/pom.xml
===================================================================
--- jbpm4/branches/ainze/modules/spring/pom.xml	2009-03-04 14:08:01 UTC (rev 4134)
+++ jbpm4/branches/ainze/modules/spring/pom.xml	2009-03-04 14:08:34 UTC (rev 4135)
@@ -58,13 +58,13 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring</artifactId>
-			<version>2.5.4</version>
+			<version>${spring.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>2.5.4</version>
+			<artifactId>spring-mock</artifactId>
+			<version>${spring.version}</version>
 		</dependency>
 
 	</dependencies>

Modified: jbpm4/branches/ainze/modules/spring/src/main/java/org/jbpm/spring/test/AbstractTransactionalSpringJbpmTestCase.java
===================================================================
--- jbpm4/branches/ainze/modules/spring/src/main/java/org/jbpm/spring/test/AbstractTransactionalSpringJbpmTestCase.java	2009-03-04 14:08:01 UTC (rev 4134)
+++ jbpm4/branches/ainze/modules/spring/src/main/java/org/jbpm/spring/test/AbstractTransactionalSpringJbpmTestCase.java	2009-03-04 14:08:34 UTC (rev 4135)
@@ -8,7 +8,6 @@
 import org.jbpm.Configuration;
 import org.jbpm.ExecutionService;
 import org.jbpm.ManagementService;
-import org.jbpm.ProcessDefinition;
 import org.jbpm.ProcessEngine;
 import org.jbpm.ProcessService;
 import org.jbpm.TaskService;
@@ -22,7 +21,7 @@
  * 
  */
 public abstract class AbstractTransactionalSpringJbpmTestCase extends
-		AbstractTransactionalDataSourceSpringContextTests {
+	AbstractTransactionalDataSourceSpringContextTests {
 
 	private Configuration configuration;
 	private ProcessEngine processEngine;
@@ -32,6 +31,15 @@
 	protected TaskService taskService;
 	protected ManagementService managementService;
 	protected List<String> taskIds;
+	
+	public AbstractTransactionalSpringJbpmTestCase() {
+		super();
+		
+		//AUTOWIRE_BY_NAME is default behavior for Spring version 2.5.x
+		//AUTOWIRE_BY_TYPE is default behavior for Spring version 2.0.8, but
+		// fails because of Hibernate specific instances.
+		setAutowireMode(AUTOWIRE_BY_NAME);
+	}
 
 	/**
 	 * {@inheritDoc)

Modified: jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/activities/ExclusiveTest.java
===================================================================
--- jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/activities/ExclusiveTest.java	2009-03-04 14:08:01 UTC (rev 4134)
+++ jbpm4/branches/ainze/modules/spring/src/test/java/org/jbpm/spring/test/activities/ExclusiveTest.java	2009-03-04 14:08:34 UTC (rev 4135)
@@ -26,6 +26,7 @@
 
 import org.jbpm.Execution;
 import org.jbpm.spring.test.AbstractTransactionalSpringJbpmTestCase;
+import org.springframework.core.io.ClassPathResource;
 
 
 /**
@@ -34,6 +35,7 @@
 public class ExclusiveTest extends AbstractTransactionalSpringJbpmTestCase {
 
 	
+	
 	@Override
 	protected String[] getConfigLocations() {
 		return new String[]{"org/jbpm/spring/test/applicationContext.xml"};

Modified: jbpm4/branches/ainze/pom.xml
===================================================================
--- jbpm4/branches/ainze/pom.xml	2009-03-04 14:08:01 UTC (rev 4134)
+++ jbpm4/branches/ainze/pom.xml	2009-03-04 14:08:34 UTC (rev 4135)
@@ -62,7 +62,7 @@
     <junit.version>3.8.1</junit.version>
     <log4j.version>1.2.14</log4j.version>
     <servlet-api.version>2.5</servlet-api.version>
-    <spring.version>2.5.4</spring.version>
+    <spring.version>2.0.8</spring.version>
     <stax.api.version>1.0.1</stax.api.version>
     <woodstox.version>3.2.6</woodstox.version>
     <!-- Database Driver Versions  -->