From 45bcdb60acb27c958849955b8806ed63d47a2844 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Mon, 28 Nov 2011 16:17:43 +0100 Subject: [PATCH] DATAJPA-127 - Setup hybrid Spring 3.0.6 / 3.1 build. Removed deprecated usage of XmlBeanFactory in tests. --- pom.xml | 23 +++++++++++++++++-- ...tingBeanFactoryPostProcessorUnitTests.java | 11 +++++---- .../AuditingBeanDefinitionParserTests.java | 8 +++++-- ...RepositoryConfigDefinitionParserTests.java | 8 ++++--- .../EntityManagerFactoryRefUnitTests.java | 7 ++++-- template.mf | 4 ++-- 6 files changed, 45 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index bfffa1f52..e1d23ec80 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,9 @@ - 3.0.6.RELEASE + 3.0.6.RELEASE + 3.1.0.RC2 + [${spring.version.30}, ${spring.version.31}] 1.2.0.BUILD-SNAPSHOT 3.6.5.Final 2.1.0 @@ -263,6 +265,18 @@ ${spring.version} + + org.springframework + spring-tx + ${spring.version} + + + + org.springframework + spring-beans + ${spring.version} + + org.springframework spring-core @@ -443,7 +457,7 @@ **/*Tests.java - -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 + -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 @@ -642,6 +656,11 @@ Spring Framework Maven Release Repository http://maven.springframework.org/release + + repository.springframework.maven.milestone + Spring Framework Maven Milestone Repository + http://maven.springframework.org/milestone + repository.springsource.maven.bundles.release SpringSource Maven Bundles Release Repository diff --git a/src/test/java/org/springframework/data/jpa/domain/support/AuditingBeanFactoryPostProcessorUnitTests.java b/src/test/java/org/springframework/data/jpa/domain/support/AuditingBeanFactoryPostProcessorUnitTests.java index e04e2a45c..8fc2af17c 100644 --- 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( diff --git a/src/test/java/org/springframework/data/jpa/repository/config/AuditingBeanDefinitionParserTests.java b/src/test/java/org/springframework/data/jpa/repository/config/AuditingBeanDefinitionParserTests.java index dbea6ed1f..23b285a2e 100644 --- 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"); diff --git a/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigDefinitionParserTests.java b/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigDefinitionParserTests.java index d9c50f4a7..dd2056705 100644 --- 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())); diff --git a/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerFactoryRefUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/EntityManagerFactoryRefUnitTests.java index 52be21df3..cbe8608e3 100644 --- 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"); diff --git a/template.mf b/template.mf index e0e6437e6..da3c9e376 100644 --- 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" \ No newline at end of file