From 69e80bd349273a78e779a54557db885bc23e3c8c Mon Sep 17 00:00:00 2001
From: Calvin <calvinxiu@gmail.com>
Date: Thu, 6 Sep 2012 22:18:09 +0800
Subject: [PATCH] =?UTF-8?q?#=20=E4=BF=AE=E5=A4=8DJBoss=E9=87=8C=E9=83=A8?=
 =?UTF-8?q?=E7=BD=B2=E5=A4=B1=E8=B4=A5=E7=9A=84bug=EF=BC=8C=E5=8E=9F?=
 =?UTF-8?q?=E6=9D=A5=E5=BF=98=E8=AE=B0=E5=86=99baseScanPackage=E4=BA=86?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=A6=E5=A4=96persistence.xml=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E5=BD=BB=E5=BA=95=E5=88=A0=E9=99=A4=E4=BA=86.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/quickstart/bin/package.bat                       | 8 ++++++++
 .../src/main/resources/META-INF/jpa_persistence.xml       | 8 --------
 examples/quickstart/src/main/resources/META-INF/orm.xml   | 4 ----
 .../quickstart/src/main/resources/applicationContext.xml  | 3 +--
 examples/showcase/bin/package.bat                         | 8 ++++++++
 .../src/main/resources/META-INF/jpa_persistence.xml       | 8 --------
 examples/showcase/src/main/resources/META-INF/orm.xml     | 4 ----
 .../showcase/src/main/resources/applicationContext.xml    | 3 +--
 8 files changed, 18 insertions(+), 28 deletions(-)
 create mode 100644 examples/quickstart/bin/package.bat
 delete mode 100644 examples/quickstart/src/main/resources/META-INF/jpa_persistence.xml
 delete mode 100644 examples/quickstart/src/main/resources/META-INF/orm.xml
 create mode 100644 examples/showcase/bin/package.bat
 delete mode 100644 examples/showcase/src/main/resources/META-INF/jpa_persistence.xml
 delete mode 100644 examples/showcase/src/main/resources/META-INF/orm.xml

diff --git a/examples/quickstart/bin/package.bat b/examples/quickstart/bin/package.bat
new file mode 100644
index 00000000..69c38b1b
--- /dev/null
+++ b/examples/quickstart/bin/package.bat
@@ -0,0 +1,8 @@
+@echo off
+echo [INFO] Package the war in target dir.
+
+cd %~dp0
+cd ..
+call mvn package -Dmaven.test.skip=true
+cd bin
+pause
\ No newline at end of file
diff --git a/examples/quickstart/src/main/resources/META-INF/jpa_persistence.xml b/examples/quickstart/src/main/resources/META-INF/jpa_persistence.xml
deleted file mode 100644
index e6d6e1d7..00000000
--- a/examples/quickstart/src/main/resources/META-INF/jpa_persistence.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
-	<!-- Keep this file empty, Spring will scan the @Entity classes -->
-	<persistence-unit name="defaultPU" transaction-type="RESOURCE_LOCAL">
-		<mapping-file>META-INF/orm.xml</mapping-file>
-	</persistence-unit>
-</persistence>
\ No newline at end of file
diff --git a/examples/quickstart/src/main/resources/META-INF/orm.xml b/examples/quickstart/src/main/resources/META-INF/orm.xml
deleted file mode 100644
index 9a2e1d95..00000000
--- a/examples/quickstart/src/main/resources/META-INF/orm.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm/orm_2_0.xsd" version="2.0">
-</entity-mappings>
\ No newline at end of file
diff --git a/examples/quickstart/src/main/resources/applicationContext.xml b/examples/quickstart/src/main/resources/applicationContext.xml
index 2a9bc85b..d53b92b3 100644
--- a/examples/quickstart/src/main/resources/applicationContext.xml
+++ b/examples/quickstart/src/main/resources/applicationContext.xml
@@ -22,9 +22,8 @@
 	<!-- Jpa Entity Manager 配置 -->
 	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"> 
 		<property name="dataSource" ref="dataSource"/>
-		<property name="persistenceUnitName" value="defaultPU"/>
 		<property name="jpaVendorAdapter" ref="hibernateJpaVendorAdapter"/>
-		<property name="persistenceXmlLocation" value="classpath*:META-INF/jpa_persistence.xml" />
+		<property name="packagesToScan" value="org.springside.examples.quickstart"/>
 		<property name="jpaProperties">
 			<props>
 				<!-- 命名规则 My_NAME->MyName -->
diff --git a/examples/showcase/bin/package.bat b/examples/showcase/bin/package.bat
new file mode 100644
index 00000000..69c38b1b
--- /dev/null
+++ b/examples/showcase/bin/package.bat
@@ -0,0 +1,8 @@
+@echo off
+echo [INFO] Package the war in target dir.
+
+cd %~dp0
+cd ..
+call mvn package -Dmaven.test.skip=true
+cd bin
+pause
\ No newline at end of file
diff --git a/examples/showcase/src/main/resources/META-INF/jpa_persistence.xml b/examples/showcase/src/main/resources/META-INF/jpa_persistence.xml
deleted file mode 100644
index e6d6e1d7..00000000
--- a/examples/showcase/src/main/resources/META-INF/jpa_persistence.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
-	<!-- Keep this file empty, Spring will scan the @Entity classes -->
-	<persistence-unit name="defaultPU" transaction-type="RESOURCE_LOCAL">
-		<mapping-file>META-INF/orm.xml</mapping-file>
-	</persistence-unit>
-</persistence>
\ No newline at end of file
diff --git a/examples/showcase/src/main/resources/META-INF/orm.xml b/examples/showcase/src/main/resources/META-INF/orm.xml
deleted file mode 100644
index 9a2e1d95..00000000
--- a/examples/showcase/src/main/resources/META-INF/orm.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm/orm_2_0.xsd" version="2.0">
-</entity-mappings>
\ No newline at end of file
diff --git a/examples/showcase/src/main/resources/applicationContext.xml b/examples/showcase/src/main/resources/applicationContext.xml
index f40fc198..c2e5028e 100644
--- a/examples/showcase/src/main/resources/applicationContext.xml
+++ b/examples/showcase/src/main/resources/applicationContext.xml
@@ -22,9 +22,8 @@
 	<!-- Jpa Entity Manager 配置 -->
 	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
 		<property name="dataSource" ref="dataSource"/>
-		<property name="persistenceUnitName" value="defaultPU"/>
 		<property name="jpaVendorAdapter" ref="hibernateJpaVendorAdapter"/>
-		<property name="persistenceXmlLocation" value="classpath*:META-INF/jpa_persistence.xml" />
+		<property name="packagesToScan" value="org.springside.examples.showcase"/>
 		<property name="jpaProperties">
 			<props>
 				<prop key="hibernate.cache.region.factory_class">org.hibernate.cache.ehcache.EhCacheRegionFactory</prop>
-- 
GitLab