From 806f3f184c87272adb6ea69aa926c3076f18cd31 Mon Sep 17 00:00:00 2001
From: Hardy Ferentschik <hibernate@ferentschik.de>
Date: Fri, 23 Oct 2009 13:48:18 +0000
Subject: [PATCH] HHH-4523 restructured the test resources

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@17826 1b8cb986-b30d-0410-93ca-fae66ebed9b2
---
 entitymanager/pom.xml                         | 19 ++++++-------------
 .../cfgxmlpar/META-INF/persistence.xml        |  0
 .../ejb/test/pack/cfgxmlpar/hibernate.cfg.xml |  0
 .../defaultpar/META-INF/orm.xml               |  0
 .../defaultpar/META-INF/persistence.xml       |  0
 .../ejb/test/pack/defaultpar/Mouse.hbm.xml    |  0
 .../excludehbmpar/META-INF/orm2.xml           |  0
 .../excludehbmpar/META-INF/persistence.xml    |  0
 .../ejb/test/pack/excludehbmpar/Mouse.hbm.xml |  0
 .../explicitpar/META-INF/orm.xml              |  0
 .../explicitpar/META-INF/persistence.xml      |  0
 .../explodedpar/META-INF/persistence.xml      |  0
 .../test/pack/explodedpar/Elephant.hbm.xml    |  0
 .../externaljar/META-INF/MANIFEST.MF          |  0
 .../externaljar/META-INF/orm.xml              |  0
 .../overridenpar/META-INF/persistence.xml     |  0
 .../space par/META-INF/persistence.xml        |  0
 .../war/WEB-INF/classes/META-INF/orm.xml      |  0
 .../WEB-INF/classes/META-INF/persistence.xml  |  0
 .../hibernate/ejb/test/pack/war/Mouse.hbm.xml |  0
 .../src/test/resources/hibernate.properties   |  2 ++
 .../test/ejb3configuration/hibernate.cfg.xml  |  0
 .../org/hibernate/ejb/test/hibernate.cfg.xml  |  0
 .../hibernate/ejb/test/ops/Employer.hbm.xml   |  0
 .../org/hibernate/ejb/test/ops/Node.hbm.xml   |  0
 .../ejb/test/ops/ParentChild.hbm.xml          |  0
 .../org/hibernate/ejb/test/xml/orm.xml        |  0
 .../org/hibernate/ejb/test/xml/orm2.xml       |  0
 .../org/hibernate/ejb/test/xml/orm3.xml       |  0
 .../hibernate/ejb/test/xml/sequences/orm.xml  |  0
 .../hibernate/ejb/test/xml/sequences/orm2.xml |  0
 .../hibernate/ejb/test/xml/sequences/orm3.xml |  0
 32 files changed, 8 insertions(+), 13 deletions(-)
 rename entitymanager/src/test/{resources => bundles}/cfgxmlpar/META-INF/persistence.xml (100%)
 rename entitymanager/src/test/{resources => bundles}/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml (100%)
 rename entitymanager/src/test/{resources => bundles}/defaultpar/META-INF/orm.xml (100%)
 rename entitymanager/src/test/{resources => bundles}/defaultpar/META-INF/persistence.xml (100%)
 rename entitymanager/src/test/{resources => bundles}/defaultpar/org/hibernate/ejb/test/pack/defaultpar/Mouse.hbm.xml (100%)
 rename entitymanager/src/test/{resources => bundles}/excludehbmpar/META-INF/orm2.xml (100%)
 rename entitymanager/src/test/{resources => bundles}/excludehbmpar/META-INF/persistence.xml (100%)
 rename entitymanager/src/test/{resources => bundles}/excludehbmpar/org/hibernate/ejb/test/pack/excludehbmpar/Mouse.hbm.xml (100%)
 rename entitymanager/src/test/{resources => bundles}/explicitpar/META-INF/orm.xml (100%)
 rename entitymanager/src/test/{resources => bundles}/explicitpar/META-INF/persistence.xml (100%)
 rename entitymanager/src/test/{resources => bundles}/explodedpar/META-INF/persistence.xml (100%)
 rename entitymanager/src/test/{resources => bundles}/explodedpar/org/hibernate/ejb/test/pack/explodedpar/Elephant.hbm.xml (100%)
 rename entitymanager/src/test/{resources => bundles}/externaljar/META-INF/MANIFEST.MF (100%)
 rename entitymanager/src/test/{resources => bundles}/externaljar/META-INF/orm.xml (100%)
 rename entitymanager/src/test/{resources => bundles}/overridenpar/META-INF/persistence.xml (100%)
 rename entitymanager/src/test/{resources => bundles}/space par/META-INF/persistence.xml (100%)
 rename entitymanager/src/test/{resources => bundles}/war/WEB-INF/classes/META-INF/orm.xml (100%)
 rename entitymanager/src/test/{resources => bundles}/war/WEB-INF/classes/META-INF/persistence.xml (100%)
 rename entitymanager/src/test/{resources => bundles}/war/WEB-INF/classes/org/hibernate/ejb/test/pack/war/Mouse.hbm.xml (100%)
 rename entitymanager/src/test/{java => resources}/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml (100%)
 rename entitymanager/src/test/{java => resources}/org/hibernate/ejb/test/hibernate.cfg.xml (100%)
 rename entitymanager/src/test/{java => resources}/org/hibernate/ejb/test/ops/Employer.hbm.xml (100%)
 rename entitymanager/src/test/{java => resources}/org/hibernate/ejb/test/ops/Node.hbm.xml (100%)
 rename entitymanager/src/test/{java => resources}/org/hibernate/ejb/test/ops/ParentChild.hbm.xml (100%)
 rename entitymanager/src/test/{java => resources}/org/hibernate/ejb/test/xml/orm.xml (100%)
 rename entitymanager/src/test/{java => resources}/org/hibernate/ejb/test/xml/orm2.xml (100%)
 rename entitymanager/src/test/{java => resources}/org/hibernate/ejb/test/xml/orm3.xml (100%)
 rename entitymanager/src/test/{java => resources}/org/hibernate/ejb/test/xml/sequences/orm.xml (100%)
 rename entitymanager/src/test/{java => resources}/org/hibernate/ejb/test/xml/sequences/orm2.xml (100%)
 rename entitymanager/src/test/{java => resources}/org/hibernate/ejb/test/xml/sequences/orm3.xml (100%)

diff --git a/entitymanager/pom.xml b/entitymanager/pom.xml
index 15c2322723..a53d6bb579 100644
--- a/entitymanager/pom.xml
+++ b/entitymanager/pom.xml
@@ -71,22 +71,15 @@
     <build>
         <testResources>
             <testResource>
-                <filtering>false</filtering>
-                <directory>src/test/java</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                </includes>
+                <filtering>true</filtering>
+                <directory>src/test/resources</directory>
             </testResource>
             <testResource>
                 <filtering>true</filtering>
-                <directory>src/test/resources</directory>
-               <includes>
-	                <include>META-INF/**</include>
-                    <include>*.properties</include>
-                </includes>
-            </testResource>
+                <directory>src/test/bundles</directory>
+				<targetPath>../bundles</targetPath>
+            </testResource>          
         </testResources>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -153,7 +146,7 @@
 	                    <property name="package.dir" value="${basedir}/target/test-packages" />
 	                    <property name="package.tmp.dir" value="${basedir}/target/tmp" />
 	                    <property name="classes.dir" value="${project.build.directory}/test-classes" />	
-                        <property name="testresources.dir" value="${basedir}/src/test/resources" />					
+                        <property name="testresources.dir" value="${basedir}/src/test/bundles" />					
 	                	<ant antfile="${basedir}/build.xml">
 	                  		<target name="package" />
 	                	</ant>
diff --git a/entitymanager/src/test/resources/cfgxmlpar/META-INF/persistence.xml b/entitymanager/src/test/bundles/cfgxmlpar/META-INF/persistence.xml
similarity index 100%
rename from entitymanager/src/test/resources/cfgxmlpar/META-INF/persistence.xml
rename to entitymanager/src/test/bundles/cfgxmlpar/META-INF/persistence.xml
diff --git a/entitymanager/src/test/resources/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml b/entitymanager/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml
similarity index 100%
rename from entitymanager/src/test/resources/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml
rename to entitymanager/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml
diff --git a/entitymanager/src/test/resources/defaultpar/META-INF/orm.xml b/entitymanager/src/test/bundles/defaultpar/META-INF/orm.xml
similarity index 100%
rename from entitymanager/src/test/resources/defaultpar/META-INF/orm.xml
rename to entitymanager/src/test/bundles/defaultpar/META-INF/orm.xml
diff --git a/entitymanager/src/test/resources/defaultpar/META-INF/persistence.xml b/entitymanager/src/test/bundles/defaultpar/META-INF/persistence.xml
similarity index 100%
rename from entitymanager/src/test/resources/defaultpar/META-INF/persistence.xml
rename to entitymanager/src/test/bundles/defaultpar/META-INF/persistence.xml
diff --git a/entitymanager/src/test/resources/defaultpar/org/hibernate/ejb/test/pack/defaultpar/Mouse.hbm.xml b/entitymanager/src/test/bundles/defaultpar/org/hibernate/ejb/test/pack/defaultpar/Mouse.hbm.xml
similarity index 100%
rename from entitymanager/src/test/resources/defaultpar/org/hibernate/ejb/test/pack/defaultpar/Mouse.hbm.xml
rename to entitymanager/src/test/bundles/defaultpar/org/hibernate/ejb/test/pack/defaultpar/Mouse.hbm.xml
diff --git a/entitymanager/src/test/resources/excludehbmpar/META-INF/orm2.xml b/entitymanager/src/test/bundles/excludehbmpar/META-INF/orm2.xml
similarity index 100%
rename from entitymanager/src/test/resources/excludehbmpar/META-INF/orm2.xml
rename to entitymanager/src/test/bundles/excludehbmpar/META-INF/orm2.xml
diff --git a/entitymanager/src/test/resources/excludehbmpar/META-INF/persistence.xml b/entitymanager/src/test/bundles/excludehbmpar/META-INF/persistence.xml
similarity index 100%
rename from entitymanager/src/test/resources/excludehbmpar/META-INF/persistence.xml
rename to entitymanager/src/test/bundles/excludehbmpar/META-INF/persistence.xml
diff --git a/entitymanager/src/test/resources/excludehbmpar/org/hibernate/ejb/test/pack/excludehbmpar/Mouse.hbm.xml b/entitymanager/src/test/bundles/excludehbmpar/org/hibernate/ejb/test/pack/excludehbmpar/Mouse.hbm.xml
similarity index 100%
rename from entitymanager/src/test/resources/excludehbmpar/org/hibernate/ejb/test/pack/excludehbmpar/Mouse.hbm.xml
rename to entitymanager/src/test/bundles/excludehbmpar/org/hibernate/ejb/test/pack/excludehbmpar/Mouse.hbm.xml
diff --git a/entitymanager/src/test/resources/explicitpar/META-INF/orm.xml b/entitymanager/src/test/bundles/explicitpar/META-INF/orm.xml
similarity index 100%
rename from entitymanager/src/test/resources/explicitpar/META-INF/orm.xml
rename to entitymanager/src/test/bundles/explicitpar/META-INF/orm.xml
diff --git a/entitymanager/src/test/resources/explicitpar/META-INF/persistence.xml b/entitymanager/src/test/bundles/explicitpar/META-INF/persistence.xml
similarity index 100%
rename from entitymanager/src/test/resources/explicitpar/META-INF/persistence.xml
rename to entitymanager/src/test/bundles/explicitpar/META-INF/persistence.xml
diff --git a/entitymanager/src/test/resources/explodedpar/META-INF/persistence.xml b/entitymanager/src/test/bundles/explodedpar/META-INF/persistence.xml
similarity index 100%
rename from entitymanager/src/test/resources/explodedpar/META-INF/persistence.xml
rename to entitymanager/src/test/bundles/explodedpar/META-INF/persistence.xml
diff --git a/entitymanager/src/test/resources/explodedpar/org/hibernate/ejb/test/pack/explodedpar/Elephant.hbm.xml b/entitymanager/src/test/bundles/explodedpar/org/hibernate/ejb/test/pack/explodedpar/Elephant.hbm.xml
similarity index 100%
rename from entitymanager/src/test/resources/explodedpar/org/hibernate/ejb/test/pack/explodedpar/Elephant.hbm.xml
rename to entitymanager/src/test/bundles/explodedpar/org/hibernate/ejb/test/pack/explodedpar/Elephant.hbm.xml
diff --git a/entitymanager/src/test/resources/externaljar/META-INF/MANIFEST.MF b/entitymanager/src/test/bundles/externaljar/META-INF/MANIFEST.MF
similarity index 100%
rename from entitymanager/src/test/resources/externaljar/META-INF/MANIFEST.MF
rename to entitymanager/src/test/bundles/externaljar/META-INF/MANIFEST.MF
diff --git a/entitymanager/src/test/resources/externaljar/META-INF/orm.xml b/entitymanager/src/test/bundles/externaljar/META-INF/orm.xml
similarity index 100%
rename from entitymanager/src/test/resources/externaljar/META-INF/orm.xml
rename to entitymanager/src/test/bundles/externaljar/META-INF/orm.xml
diff --git a/entitymanager/src/test/resources/overridenpar/META-INF/persistence.xml b/entitymanager/src/test/bundles/overridenpar/META-INF/persistence.xml
similarity index 100%
rename from entitymanager/src/test/resources/overridenpar/META-INF/persistence.xml
rename to entitymanager/src/test/bundles/overridenpar/META-INF/persistence.xml
diff --git a/entitymanager/src/test/resources/space par/META-INF/persistence.xml b/entitymanager/src/test/bundles/space par/META-INF/persistence.xml
similarity index 100%
rename from entitymanager/src/test/resources/space par/META-INF/persistence.xml
rename to entitymanager/src/test/bundles/space par/META-INF/persistence.xml
diff --git a/entitymanager/src/test/resources/war/WEB-INF/classes/META-INF/orm.xml b/entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/orm.xml
similarity index 100%
rename from entitymanager/src/test/resources/war/WEB-INF/classes/META-INF/orm.xml
rename to entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/orm.xml
diff --git a/entitymanager/src/test/resources/war/WEB-INF/classes/META-INF/persistence.xml b/entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml
similarity index 100%
rename from entitymanager/src/test/resources/war/WEB-INF/classes/META-INF/persistence.xml
rename to entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml
diff --git a/entitymanager/src/test/resources/war/WEB-INF/classes/org/hibernate/ejb/test/pack/war/Mouse.hbm.xml b/entitymanager/src/test/bundles/war/WEB-INF/classes/org/hibernate/ejb/test/pack/war/Mouse.hbm.xml
similarity index 100%
rename from entitymanager/src/test/resources/war/WEB-INF/classes/org/hibernate/ejb/test/pack/war/Mouse.hbm.xml
rename to entitymanager/src/test/bundles/war/WEB-INF/classes/org/hibernate/ejb/test/pack/war/Mouse.hbm.xml
diff --git a/entitymanager/src/test/resources/hibernate.properties b/entitymanager/src/test/resources/hibernate.properties
index b6eeb1a820..1d81cd42ea 100644
--- a/entitymanager/src/test/resources/hibernate.properties
+++ b/entitymanager/src/test/resources/hibernate.properties
@@ -29,3 +29,5 @@ hibernate.max_fetch_depth 5
 
 hibernate.cache.region_prefix hibernate.test
 hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider
+
+hibernate.jdbc.batch_size 0
diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml b/entitymanager/src/test/resources/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml
similarity index 100%
rename from entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml
rename to entitymanager/src/test/resources/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml
diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/hibernate.cfg.xml b/entitymanager/src/test/resources/org/hibernate/ejb/test/hibernate.cfg.xml
similarity index 100%
rename from entitymanager/src/test/java/org/hibernate/ejb/test/hibernate.cfg.xml
rename to entitymanager/src/test/resources/org/hibernate/ejb/test/hibernate.cfg.xml
diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employer.hbm.xml b/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Employer.hbm.xml
similarity index 100%
rename from entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employer.hbm.xml
rename to entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Employer.hbm.xml
diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Node.hbm.xml b/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Node.hbm.xml
similarity index 100%
rename from entitymanager/src/test/java/org/hibernate/ejb/test/ops/Node.hbm.xml
rename to entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Node.hbm.xml
diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/ParentChild.hbm.xml b/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/ParentChild.hbm.xml
similarity index 100%
rename from entitymanager/src/test/java/org/hibernate/ejb/test/ops/ParentChild.hbm.xml
rename to entitymanager/src/test/resources/org/hibernate/ejb/test/ops/ParentChild.hbm.xml
diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm.xml b/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm.xml
similarity index 100%
rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm.xml
rename to entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm.xml
diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm2.xml b/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm2.xml
similarity index 100%
rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm2.xml
rename to entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm2.xml
diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm3.xml b/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm3.xml
similarity index 100%
rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm3.xml
rename to entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm3.xml
diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm.xml b/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm.xml
similarity index 100%
rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm.xml
rename to entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm.xml
diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm2.xml b/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm2.xml
similarity index 100%
rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm2.xml
rename to entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm2.xml
diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm3.xml b/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm3.xml
similarity index 100%
rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/orm3.xml
rename to entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm3.xml