[Springframework-cvs] spring/tiger/test/org/springframework/orm/jpa/hibernate hibernate-manager.xml, 1.10, 1.11 HibernateEntityManagerFactoryIntegrationTests.java, 1.7, 1.8

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/tiger/test/org/springframework/orm/jpa/hibernate
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10756/tiger/test/org/springframework/orm/jpa/hibernate

Modified Files:
	hibernate-manager.xml 
	HibernateEntityManagerFactoryIntegrationTests.java 
Log Message:
@PersistenceContext for default EntityManagerFactory lookup works even in an @Configurable Hibernate entity

Index: hibernate-manager.xml
===================================================================
RCS file: /cvsroot/springframework/spring/tiger/test/org/springframework/orm/jpa/hibernate/hibernate-manager.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** hibernate-manager.xml	14 Jul 2008 12:48:28 -0000	1.10
--- hibernate-manager.xml	21 Oct 2008 11:02:19 -0000	1.11
***************
*** 1,9 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
  
! <beans>
! 	
! 	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
! 		<property name="persistenceXmlLocation" value="org/springframework/orm/jpa/domain/persistence.xml"/>
  		<property name="dataSource" ref="dataSource"/>
  		<property name="jpaVendorAdapter">
--- 1,18 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <beans xmlns="http://www.springframework.org/schema/beans"
! 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
! 	xmlns:context="http://www.springframework.org/schema/context"
! 	xsi:schemaLocation="
! 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
! 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
  
! 	<context:load-time-weaver aspectj-weaving="on"/>
! 
! 	<context:annotation-config/>
! 
! 	<context:spring-configured/>
! 
! 	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" depends-on="org.springframework.context.config.internalBeanConfigurerAspect">
! 		<property name="persistenceXmlLocation" value="org/springframework/orm/jpa/domain/persistence-context.xml"/>
  		<property name="dataSource" ref="dataSource"/>
  		<property name="jpaVendorAdapter">

Index: HibernateEntityManagerFactoryIntegrationTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/tiger/test/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** HibernateEntityManagerFactoryIntegrationTests.java	14 Jul 2008 12:48:28 -0000	1.7
--- HibernateEntityManagerFactoryIntegrationTests.java	21 Oct 2008 11:02:19 -0000	1.8
***************
*** 26,29 ****
--- 26,30 ----
  import org.springframework.orm.jpa.AbstractContainerEntityManagerFactoryIntegrationTests;
  import org.springframework.orm.jpa.EntityManagerFactoryInfo;
+ import org.springframework.orm.jpa.domain.ContextualPerson;
  import org.springframework.orm.jpa.domain.Person;
  
***************
*** 72,74 ****
--- 73,81 ----
  	}
  
+ 	public void testConfigurablePerson() {
+ 		Query q = this.sessionFactory.getCurrentSession().createQuery("select p from ContextualPerson as p");
+ 		assertEquals(0, q.list().size());
+ 		assertNotNull(new ContextualPerson().entityManager);
+ 	}
+ 
  }