One test works..

hapi-fhir-jpaserver-base/.gitignore

@@ -2,6 +2,7 @@ target/
 /bin
 nohup.out
 lucene_indexes/
+ca.uhn.fhir.jpa.entity.ResourceTable/
 
 # Created by https://www.gitignore.io
 

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu2Config.java

@@ -2,27 +2,23 @@ package ca.uhn.fhir.jpa.config;
 
 import java.util.Properties;
 
+import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
 import org.apache.commons.dbcp2.BasicDataSource;
-import org.hibernate.dialect.DerbyTenSevenDialect;
 import org.hibernate.jpa.HibernatePersistenceProvider;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.orm.jpa.JpaVendorAdapter;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
-import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.springframework.transaction.annotation.TransactionManagementConfigurer;
 
 import ca.uhn.fhir.jpa.dao.DaoConfig;
 import ca.uhn.fhir.jpa.rp.dstu2.BaseJavaConfigDstu2;
 
 @Configuration
 @EnableTransactionManagement()
-public class TestDstu2Config extends BaseJavaConfigDstu2 implements TransactionManagementConfigurer {
+public class TestDstu2Config extends BaseJavaConfigDstu2 {
 
 	@Bean(name="myDaoConfigDstu2")
 	public DaoConfig daoConfigDstu2() {
@@ -39,11 +35,10 @@ public class TestDstu2Config extends BaseJavaConfigDstu2 implements TransactionM
 		return retVal;
 	}
 
-	@Bean(name="myTransactionManagerDstu2")
-	public JpaTransactionManager platformTransactionManagerDstu2() {
+	@Bean()
+	public JpaTransactionManager transactionManager(EntityManagerFactory entityManagerFactory) {
 		JpaTransactionManager retVal = new JpaTransactionManager();
-		retVal.setEntityManagerFactory(entityManagerFactoryDstu2().getNativeEntityManagerFactory());
-		retVal.afterPropertiesSet();
+		retVal.setEntityManagerFactory(entityManagerFactory);
 		return retVal;
 	}
 
@@ -67,9 +62,4 @@ public class TestDstu2Config extends BaseJavaConfigDstu2 implements TransactionM
       return extraProperties;
   }
 
-	@Override
-	public PlatformTransactionManager annotationDrivenTransactionManager() {
-		return platformTransactionManagerDstu2();
-	}
-   
 }

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseJpaDstu2Test.java

@@ -99,8 +99,11 @@ public abstract class BaseJpaDstu2Test extends BaseJpaTest {
 	@Autowired
 	@Qualifier("myEncounterDaoDstu2")
 	protected IFhirResourceDao<Encounter> myEncounterDao;
-	@PersistenceContext()
+	
+//	@PersistenceContext()
+	@Autowired
 	protected EntityManager myEntityManager;
+	
 	@Autowired
 	@Qualifier("myFhirContextDstu2")
 	protected FhirContext myFhirCtx;