From dd521eb88a32fb613d1a18ae9b9f30cd7b227707 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Mon, 14 Dec 2009 19:06:58 +0000
Subject: [PATCH] SAMPLESPET-3 + renamed META-INF/persistence.xml to
META-INF/jpa-persistence.xml since JBoss will scan it automatically and
complain about non-jta-resources declared.
---
src/main/webapp/WEB-INF/applicationContext-jpa.xml | 5 ++++-
.../META-INF/{persistence.xml => jpa-persistence.xml} | 0
2 files changed, 4 insertions(+), 1 deletion(-)
rename src/main/webapp/WEB-INF/classes/META-INF/{persistence.xml => jpa-persistence.xml} (100%)
diff --git a/src/main/webapp/WEB-INF/applicationContext-jpa.xml b/src/main/webapp/WEB-INF/applicationContext-jpa.xml
index 0803511..01ebfa0 100644
--- a/src/main/webapp/WEB-INF/applicationContext-jpa.xml
+++ b/src/main/webapp/WEB-INF/applicationContext-jpa.xml
@@ -42,6 +42,7 @@
p:database="${jpa.database}" p:showSql="${jpa.showSql}"/>
-->
</property>
+ <property name="persistenceXmlLocation" value="classpath:META-INF/jpa-persistence.xml"/>
</bean>
<!-- Transaction manager for a single JPA EntityManagerFactory (alternative to JTA) -->
@@ -62,8 +63,10 @@
<!--
Instruct Spring to perform declarative transaction management
automatically on annotated classes.
+
+ for mode="aspectj"/ see SPR-6392
-->
- <tx:annotation-driven mode="aspectj"/>
+ <tx:annotation-driven/>
<!--
Simply defining this bean will cause requests to owner names to be saved.
diff --git a/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml b/src/main/webapp/WEB-INF/classes/META-INF/jpa-persistence.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/classes/META-INF/persistence.xml
rename to src/main/webapp/WEB-INF/classes/META-INF/jpa-persistence.xml
--
GitLab