Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-12, DATAJPA-15 - transaction-manager-ref is now considered

Browse Source 
Updated to latest changes in infrastructure in Spring Data Commons.
This commit is contained in:
Oliver Gierke
2011-01-26 17:51:16 +02:00
parent c919e2a538
commit b884e7374f
3 changed files with 58 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryBean.java
View File

@@ -20,8 +20,8 @@ import javax.persistence.PersistenceContext;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.repository.support.RepositoryFactoryBeanSupport;
import org.springframework.data.repository.support.RepositoryFactorySupport;
import org.springframework.data.repository.support.TransactionalRepositoryFactoryBeanSupport;
import org.springframework.util.Assert;
@@ -34,7 +34,7 @@ import org.springframework.util.Assert;
* @param <T> the type of the repository
*/
public class JpaRepositoryFactoryBean<T extends JpaRepository<?, ?>> extends
RepositoryFactoryBeanSupport<T> {
TransactionalRepositoryFactoryBeanSupport<T> {
private EntityManager entityManager;

6
src/main/resources/org/springframework/data/jpa/repository/config/spring-jpa-1.0.xsd
View File

@@ -17,6 +17,7 @@
<xsd:complexType name="jpa-repository">
<xsd:complexContent>
<xsd:extension base="repository:repository">
<xsd:attributeGroup ref="repository:transactional-repository-attributes" />
<xsd:attribute name="entity-manager-factory-ref" type="entityManagerFactoryRef" />
</xsd:extension>
</xsd:complexContent>
@@ -29,8 +30,8 @@
<xsd:sequence>
<xsd:element name="repository" minOccurs="0" maxOccurs="unbounded" type="jpa-repository" />
</xsd:sequence>
<xsd:attribute name="entity-manager-factory-ref"
type="entityManagerFactoryRef" />
<xsd:attributeGroup ref="repository:transactional-repository-attributes" />
<xsd:attribute name="entity-manager-factory-ref" type="entityManagerFactoryRef" />
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
@@ -52,7 +53,6 @@
</xsd:complexType>
</xsd:element>
<xsd:simpleType name="entityManagerFactoryRef">
<xsd:annotation>
<xsd:appinfo>

53
src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigDefinitionParserTests.java Normal file
View File

@@ -0,0 +1,53 @@
/*
* Copyright 2008-2010 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.jpa.repository.config;
import static org.hamcrest.CoreMatchers.*;
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.core.io.ClassPathResource;
/**
* Integration test for {@link JpaRepositoryConfigDefinitionParser}.
*
* @author Oliver Gierke
*/
public class JpaRepositoryConfigDefinitionParserTests {
@Test
public void getsTransactionManagerSet() throws Exception {
XmlBeanFactory factory =
new XmlBeanFactory(new ClassPathResource(
"multiple-entity-manager-integration-context.xml"));
BeanDefinition definition =
factory.getBeanDefinition("auditableUserRepository");
assertThat(definition, is(notNullValue()));
PropertyValue transactionManager =
definition.getPropertyValues().getPropertyValue(
"transactionManager");
assertThat(transactionManager, is(notNullValue()));
assertThat(transactionManager.getValue().toString(),
is("transactionManager-2"));
}
}