From 63e564aee3ca998ff2ac5abfdb35908bd433281b Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Fri, 30 Sep 2011 12:12:32 +0200 Subject: [PATCH] DATACMNS-82 - Adapted changes in Spring Data Commons. --- .../JpaRepositoryConfigDefinitionParser.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigDefinitionParser.java b/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigDefinitionParser.java index d7215e717..cb66e42ea 100644 --- a/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigDefinitionParser.java +++ b/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigDefinitionParser.java @@ -43,13 +43,11 @@ class JpaRepositoryConfigDefinitionParser extends private static final Class PAB_POST_PROCESSOR = PersistenceAnnotationBeanPostProcessor.class; private static final Class PET_POST_PROCESSOR = PersistenceExceptionTranslationPostProcessor.class; + private static final String DEFAULT_TRANSACTION_MANAGER_BEAN_NAME = "transactionManager"; /* * (non-Javadoc) - * - * @see org.springframework.data.repository.config. - * AbstractRepositoryConfigDefinitionParser - * #getGlobalRepositoryConfigInformation(org.w3c.dom.Element) + * @see org.springframework.data.repository.config.AbstractRepositoryConfigDefinitionParser#getGlobalRepositoryConfigInformation(org.w3c.dom.Element) */ @Override protected SimpleJpaRepositoryConfiguration getGlobalRepositoryConfigInformation(Element element) { @@ -59,19 +57,16 @@ class JpaRepositoryConfigDefinitionParser extends /* * (non-Javadoc) - * - * @see org.springframework.data.repository.config. - * AbstractRepositoryConfigDefinitionParser - * #postProcessBeanDefinition(org.springframework - * .data.repository.config.SingleRepositoryConfigInformation, - * org.springframework.beans.factory.support.BeanDefinitionBuilder, - * org.springframework.beans.factory.support.BeanDefinitionRegistry, - * java.lang.Object) + * @see org.springframework.data.repository.config.AbstractRepositoryConfigDefinitionParser#postProcessBeanDefinition(org.springframework.data.repository.config.SingleRepositoryConfigInformation, org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.beans.factory.support.BeanDefinitionRegistry, java.lang.Object) */ @Override protected void postProcessBeanDefinition(JpaRepositoryConfiguration ctx, BeanDefinitionBuilder builder, BeanDefinitionRegistry registry, Object beanSource) { + String transactionManagerRef = StringUtils.hasText(ctx.getTransactionManagerRef()) ? ctx.getTransactionManagerRef() + : DEFAULT_TRANSACTION_MANAGER_BEAN_NAME; + builder.addPropertyValue("transactionManager", transactionManagerRef); + String entityManagerRef = ctx.getEntityManagerFactoryRef(); if (StringUtils.hasText(entityManagerRef)) {