From 669d21a7bde7b7bbc459326a49458094fe836273 Mon Sep 17 00:00:00 2001
From: Hardy Ferentschik <hibernate@ferentschik.de>
Date: Mon, 3 Nov 2008 15:09:16 +0000
Subject: [PATCH] HHH-3580 fixed PackagedEntityManagerTest

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@15484 1b8cb986-b30d-0410-93ca-fae66ebed9b2
---
 entitymanager/build.xml                                  | 2 +-
 entitymanager/pom.xml                                    | 1 +
 .../hibernate/ejb/test/PackagedEntityManagerTest.java    | 9 ---------
 .../test/resources/explicitpar/META-INF/persistence.xml  | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/entitymanager/build.xml b/entitymanager/build.xml
index d4d6834f04..7941e44e21 100644
--- a/entitymanager/build.xml
+++ b/entitymanager/build.xml
@@ -93,5 +93,5 @@
 			<param name="extension" value="par"/>
 			<param name="jarname" value="explodedpar"/>
 		</antcall>
-	</target>
+	</target>	
 </project>
diff --git a/entitymanager/pom.xml b/entitymanager/pom.xml
index 7c9eea0af1..4476db96a4 100644
--- a/entitymanager/pom.xml
+++ b/entitymanager/pom.xml
@@ -105,6 +105,7 @@
                 <filtering>true</filtering>
                 <directory>src/test/resources</directory>
                <includes>
+	                <include>META-INF/**</include>
                     <include>*.properties</include>
                 </includes>
             </testResource>
diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java
index 1e70e37420..0e27b25cb2 100644
--- a/entitymanager/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java
+++ b/entitymanager/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java
@@ -354,13 +354,4 @@ public class PackagedEntityManagerTest extends TestCase {
 		em.getTransaction().rollback();
 		em.close();
 	}
-
-	public PackagedEntityManagerTest() {
-		super();
-	}
-
-	public PackagedEntityManagerTest(String arg0) {
-		super( arg0 );
-	}
-
 }
\ No newline at end of file
diff --git a/entitymanager/src/test/resources/explicitpar/META-INF/persistence.xml b/entitymanager/src/test/resources/explicitpar/META-INF/persistence.xml
index 607ff0227d..fa1f0eb7a4 100644
--- a/entitymanager/src/test/resources/explicitpar/META-INF/persistence.xml
+++ b/entitymanager/src/test/resources/explicitpar/META-INF/persistence.xml
@@ -4,7 +4,7 @@
              xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
              version="1.0">
     <persistence-unit name="manager1" transaction-type="RESOURCE_LOCAL">
-        <jar-file>./build/testresources/externaljar.jar</jar-file>
+        <jar-file>./target/test-packages/externaljar.jar</jar-file>
         <class>org.hibernate.ejb.test.Cat</class>
 		<class>org.hibernate.ejb.test.Kitten</class>
         <class>org.hibernate.ejb.test.Distributor</class>