DATAJPA-127 - Setup hybrid Spring 3.0.6 / 3.1 build.

Removed deprecated usage of XmlBeanFactory in tests.
2011-11-28 16:17:43 +01:00
parent 5ffbb4f1d1
commit 45bcdb60ac
6 changed files with 45 additions and 16 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,9 @@
 	</licenses>
 	
 	<properties>
-		<spring.version>3.0.6.RELEASE</spring.version>
+		<spring.version.30>3.0.6.RELEASE</spring.version.30>
+		<spring.version.31>3.1.0.RC2</spring.version.31>
+		<spring.version>[${spring.version.30}, ${spring.version.31}]</spring.version>
 		<spring.data.commons.version>1.2.0.BUILD-SNAPSHOT</spring.data.commons.version>
 		<hibernate.version>3.6.5.Final</hibernate.version>
 		<openjpa.version>2.1.0</openjpa.version>
@@ -263,6 +265,18 @@
 			<version>${spring.version}</version>
 		</dependency>
 		
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
+		
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
@@ -443,7 +457,7 @@
 					<includes>
 						<include>**/*Tests.java</include>
 					</includes>
-					<argLine>-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring.version}/spring-instrument-${spring.version}.jar -javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar</argLine>
+					<argLine>-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring.version.31}/spring-instrument-${spring.version.31}.jar -javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar</argLine>
 				</configuration>
 				<dependencies>
 					<dependency>
@@ -642,6 +656,11 @@
 			<name>Spring Framework Maven Release Repository</name>
 			<url>http://maven.springframework.org/release</url>
 		</pluginRepository>
+		<pluginRepository>
+			<id>repository.springframework.maven.milestone</id>
+			<name>Spring Framework Maven Milestone Repository</name>
+			<url>http://maven.springframework.org/milestone</url>
+		</pluginRepository>
 		<pluginRepository>
 			<id>repository.springsource.maven.bundles.release</id>
 			<name>SpringSource Maven Bundles Release Repository</name>
--- a/src/test/java/org/springframework/data/jpa/domain/support/AuditingBeanFactoryPostProcessorUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/domain/support/AuditingBeanFactoryPostProcessorUnitTests.java
@@ -22,8 +22,8 @@ import java.util.Arrays;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;

 /**
@@ -33,13 +33,15 @@ import org.springframework.core.io.ClassPathResource;
 */
 public class AuditingBeanFactoryPostProcessorUnitTests {

-	ConfigurableListableBeanFactory beanFactory;
+	DefaultListableBeanFactory beanFactory;
 	AuditingBeanFactoryPostProcessor processor;

 	@Before
 	public void setUp() {

-		beanFactory = new XmlBeanFactory(new ClassPathResource("auditing/" + getConfigFile()));
+		beanFactory = new DefaultListableBeanFactory();
+		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(beanFactory);
+		reader.loadBeanDefinitions(new ClassPathResource("auditing/" + getConfigFile()));

 		processor = new AuditingBeanFactoryPostProcessor();
 	}
@@ -53,7 +55,6 @@ public class AuditingBeanFactoryPostProcessorUnitTests {
 	public void testname() throws Exception {

 		processor.postProcessBeanFactory(beanFactory);
-
 		BeanDefinition definition = beanFactory.getBeanDefinition("entityManagerFactory");

 		assertTrue(Arrays.asList(definition.getDependsOn()).contains(
--- a/src/test/java/org/springframework/data/jpa/repository/config/AuditingBeanDefinitionParserTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/config/AuditingBeanDefinitionParserTests.java
@@ -21,7 +21,8 @@ import static org.junit.Assert.*;
 import org.junit.Test;
 import org.springframework.beans.PropertyValue;
 import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;

 /**
@@ -45,7 +46,10 @@ public class AuditingBeanDefinitionParserTests {

 	private void assertSetDatesIsSetTo(String configFile, String value) {

-		XmlBeanFactory factory = new XmlBeanFactory(new ClassPathResource(configFile));
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(factory);
+		reader.loadBeanDefinitions(new ClassPathResource(configFile));
+
 		BeanDefinition definition = factory
 				.getBeanDefinition(AuditingBeanDefinitionParser.AUDITING_ENTITY_LISTENER_CLASS_NAME);
 		PropertyValue propertyValue = definition.getPropertyValues().getPropertyValue("dateTimeForNow");
--- a/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigDefinitionParserTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigDefinitionParserTests.java
@@ -21,7 +21,8 @@ import static org.junit.Assert.*;
 import org.junit.Test;
 import org.springframework.beans.PropertyValue;
 import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;

 /**
@@ -34,8 +35,9 @@ public class JpaRepositoryConfigDefinitionParserTests {
 	@Test
 	public void getsTransactionManagerSet() throws Exception {

-		XmlBeanFactory factory = new XmlBeanFactory(
-				new ClassPathResource("multiple-entity-manager-integration-context.xml"));
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(factory);
+		reader.loadBeanDefinitions(new ClassPathResource("multiple-entity-manager-integration-context.xml"));

 		BeanDefinition definition = factory.getBeanDefinition("auditableUserRepository");
 		assertThat(definition, is(notNullValue()));
--- a/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerFactoryRefUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerFactoryRefUnitTests.java
@@ -23,7 +23,8 @@ import javax.persistence.EntityManagerFactory;
 import org.junit.Test;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanReference;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;

 /**
@@ -36,7 +37,9 @@ public class EntityManagerFactoryRefUnitTests {
 	@Test
 	public void repositoriesGetTheSecondEntityManagerFactoryInjected2() {

-		XmlBeanFactory factory = new XmlBeanFactory(new ClassPathResource("multiple-entity-manager-context.xml"));
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(factory);
+		reader.loadBeanDefinitions(new ClassPathResource("multiple-entity-manager-context.xml"));

 		BeanDefinition bean = factory.getBeanDefinition("userRepository");
 		Object value = getPropertyValue(bean, "entityManager");
--- a/template.mf
+++ b/template.mf
@@ -17,8 +17,8 @@ Import-Template:
 org.hibernate.*;version="[3.5.3,4.0.0)";resolution:=optional, 
 org.joda.time.*;version="[1.5.0,2.0.0)";resolution:=optional,
 org.slf4j.*;version="${slf4j.version:[=.=.=,+1.0.0)}",
- org.springframework.*;version="${spring.version:[=.=.=.=,+1.0.0)}",
- org.springframework.beans.factory.aspectj;version="${spring.version:[=.=.=.=,+1.0.0)}";resolution:=optional,
+ org.springframework.*;version="${spring.version.30:[=.=.=.=,+1.0.0)}",
+ org.springframework.beans.factory.aspectj;version="${spring.version.30:[=.=.=.=,+1.0.0)}";resolution:=optional,
 org.springframework.data.*;version="${spring.data.commons.version:[=.=.=.=,+1.0.0)}",
 org.w3c.*;version="0.0.0"