HHH-7451 - Integrate Draft 7 of the JPA 2.1 spec : more ejb->jpa rename

hibernate-entitymanager/src/main/java/org/hibernate/jpa/spi/AbstractEntityManagerImpl.java

@@ -707,7 +707,7 @@ public abstract class AbstractEntityManagerImpl implements HibernateEntityManage
 			 */
 			org.hibernate.Query namedQuery = getSession().getNamedQuery( name );
 			//TODO clean this up to avoid downcasting
-			final SessionFactoryImplementor factoryImplementor = ( SessionFactoryImplementor ) entityManagerFactory.getSessionFactory();
+			final SessionFactoryImplementor factoryImplementor = entityManagerFactory.getSessionFactory();
 			final NamedSQLQueryDefinition queryDefinition = factoryImplementor.getNamedSQLQuery( name );
 			try {
 				if ( queryDefinition != null ) {

hibernate-entitymanager/src/test/bundles/cfgxmlpar/META-INF/persistence.xml

@@ -7,7 +7,7 @@
     <persistence-unit name="cfgxmlpar" transaction-type="RESOURCE_LOCAL">
         <provider>org.hibernate.ejb.HibernatePersistence</provider>
         <properties>
-            <property name="hibernate.ejb.cfgfile" value="/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml"/>
+            <property name="hibernate.ejb.cfgfile" value="/org/hibernate/jpa/test/pack/cfgxmlpar/hibernate.cfg.xml"/>
         </properties>
     </persistence-unit>
 </persistence>

hibernate-entitymanager/src/test/bundles/cfgxmlpar/org/hibernate/jpa/test/pack/cfgxmlpar/hibernate.cfg.xml

@@ -17,12 +17,12 @@
         <property name="hibernate.hbm2ddl.auto">create-drop</property>
         <property name="hibernate.generate_statistics">true</property>
         <property name="hibernate.cache.region.factory_class">org.hibernate.testing.cache.CachingRegionFactory</property>
-        <mapping class="org.hibernate.ejb.test.Item"/>
+        <mapping class="org.hibernate.jpa.test.Item"/>
-        <mapping class="org.hibernate.ejb.test.Cat"/>
+        <mapping class="org.hibernate.jpa.test.Cat"/>
-        <mapping class="org.hibernate.ejb.test.Kitten"/>
+        <mapping class="org.hibernate.jpa.test.Kitten"/>
-        <mapping class="org.hibernate.ejb.test.Distributor"/>
+        <mapping class="org.hibernate.jpa.test.Distributor"/>
-        <class-cache class="org.hibernate.ejb.test.Item" usage="read-write"/>
+        <class-cache class="org.hibernate.jpa.test.Item" usage="read-write"/>
-        <collection-cache collection="org.hibernate.ejb.test.Item.distributors" usage="read-write" region="RegionName"/>
+        <collection-cache collection="org.hibernate.jpa.test.Item.distributors" usage="read-write" region="RegionName"/>
         <event type="pre-insert"/>
     </session-factory>
 </hibernate-configuration>

hibernate-entitymanager/src/test/bundles/defaultpar/META-INF/orm.xml

@@ -8,13 +8,13 @@
     <persistence-unit-metadata>
         <persistence-unit-defaults>
             <entity-listeners>
-                <entity-listener class="org.hibernate.ejb.test.pack.defaultpar.IncrementListener">
+                <entity-listener class="org.hibernate.jpa.test.pack.defaultpar.IncrementListener">
                     <pre-persist method-name="increment"/>
                 </entity-listener>
             </entity-listeners>
         </persistence-unit-defaults>
     </persistence-unit-metadata>
-    <package>org.hibernate.ejb.test.pack.defaultpar</package>
+    <package>org.hibernate.jpa.test.pack.defaultpar</package>
     <entity class="Lighter" access="FIELD" metadata-complete="true">
         <attributes>
             <id name="name">

hibernate-entitymanager/src/test/bundles/defaultpar/META-INF/persistence.xml

@@ -5,7 +5,7 @@
              xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
              version="2.0">
     <persistence-unit name="defaultpar">
-        <class>org.hibernate.ejb.test.pack.defaultpar.Lighter</class>
+        <class>org.hibernate.jpa.test.pack.defaultpar.Lighter</class>
         <validation-mode>CALLBACK</validation-mode>
         <properties>
             <property name="hibernate.dialect" value="@db.dialect@"/>

hibernate-entitymanager/src/test/bundles/defaultpar/org/hibernate/jpa/test/pack/defaultpar/Mouse.hbm.xml

@@ -4,7 +4,7 @@
         "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping
-        package="org.hibernate.ejb.test.pack.defaultpar"
+        package="org.hibernate.jpa.test.pack.defaultpar"
         >
 
     <class name="Mouse">

hibernate-entitymanager/src/test/bundles/defaultpar_1_0/META-INF/orm.xml

@@ -9,14 +9,14 @@
     <persistence-unit-metadata>
         <persistence-unit-defaults>
             <entity-listeners>
-                <entity-listener class="org.hibernate.ejb.test.pack.defaultpar_1_0.IncrementListener1">
+                <entity-listener class="org.hibernate.jpa.test.pack.defaultpar_1_0.IncrementListener1">
                     <pre-persist method-name="increment"/>
                 </entity-listener>
             </entity-listeners>
         </persistence-unit-defaults>
     </persistence-unit-metadata>
-    <package>org.hibernate.ejb.test.pack.defaultpar_1_0</package>
+    <package>org.hibernate.jpa.test.pack.defaultpar_1_0</package>
-    <entity class="org.hibernate.ejb.test.pack.defaultpar_1_0.Lighter1" access="FIELD" metadata-complete="true">
+    <entity class="org.hibernate.jpa.test.pack.defaultpar_1_0.Lighter1" access="FIELD" metadata-complete="true">
         <attributes>
             <id name="name">
                 <column name="fld_id"/>
@@ -24,7 +24,7 @@
             <basic name="power"></basic>
         </attributes>
     </entity>
-    <entity class="org.hibernate.ejb.test.pack.defaultpar_1_0.ApplicationServer1">
+    <entity class="org.hibernate.jpa.test.pack.defaultpar_1_0.ApplicationServer1">
         <entity-listeners>
             <entity-listener class="OtherIncrementListener1">
                 <pre-persist method-name="increment"/>

hibernate-entitymanager/src/test/bundles/defaultpar_1_0/META-INF/persistence.xml

@@ -5,7 +5,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="defaultpar_1_0">
-        <class>org.hibernate.ejb.test.pack.defaultpar.Lighter</class>
+        <class>org.hibernate.jpa.test.pack.defaultpar.Lighter</class>
         <properties>
             <property name="hibernate.dialect" value="@db.dialect@"/>
             <property name="hibernate.connection.driver_class" value="@jdbc.driver@"/>

hibernate-entitymanager/src/test/bundles/defaultpar_1_0/org/hibernate/jpa/test/pack/defaultpar_1_0/Mouse1.hbm.xml

@@ -4,7 +4,7 @@
         "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping
-        package="org.hibernate.ejb.test.pack.defaultpar_1_0"
+        package="org.hibernate.jpa.test.pack.defaultpar_1_0"
         >
 
     <class name="Mouse1">

hibernate-entitymanager/src/test/bundles/excludehbmpar/META-INF/orm2.xml

@@ -5,7 +5,7 @@
                  xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
                  version="2.0"
         >
-    <package>org.hibernate.ejb.test.xml</package>
+    <package>org.hibernate.jpa.test.xml</package>
     <entity class="Light" access="FIELD" metadata-complete="true">
         <attributes>
             <id name="name">

hibernate-entitymanager/src/test/bundles/excludehbmpar/org/hibernate/jpa/test/pack/excludehbmpar/Mouse.hbm.xml

@@ -4,7 +4,7 @@
         "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping
-        package="org.hibernate.ejb.test.pack.excludehbmpar"
+        package="org.hibernate.jpa.test.pack.excludehbmpar"
         >
 
     <class name="Mouse">

hibernate-entitymanager/src/test/bundles/explicitpar/META-INF/orm.xml

@@ -5,7 +5,7 @@
                  xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
                  version="2.0"
         >
-    <package>org.hibernate.ejb.test.pack.various</package>
+    <package>org.hibernate.jpa.test.pack.various</package>
     <entity class="Seat" access="PROPERTY" metadata-complete="true">
         <attributes>
             <id name="number">

hibernate-entitymanager/src/test/bundles/explicitpar/META-INF/persistence.xml

@@ -5,14 +5,14 @@
              version="2.0">
     <persistence-unit name="manager1" transaction-type="RESOURCE_LOCAL">
         <jar-file>@buildDirName@/packages/externaljar.jar</jar-file>
-        <class>org.hibernate.ejb.test.Cat</class>
+        <class>org.hibernate.jpa.test.Cat</class>
-		<class>org.hibernate.ejb.test.Kitten</class>
+		<class>org.hibernate.jpa.test.Kitten</class>
-        <class>org.hibernate.ejb.test.Distributor</class>
+        <class>org.hibernate.jpa.test.Distributor</class>
-        <class>org.hibernate.ejb.test.Item</class>
+        <class>org.hibernate.jpa.test.Item</class>
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
         <properties>
             <!-- custom scanner test -->
-            <property name="hibernate.ejb.resource_scanner" value="org.hibernate.ejb.test.packaging.CustomScanner"/>
+            <property name="hibernate.ejb.resource_scanner" value="org.hibernate.jpa.test.packaging.CustomScanner"/>
 
             <property name="hibernate.dialect" value="@db.dialect@"/>
             <property name="hibernate.connection.driver_class" value="@jdbc.driver@"/>
@@ -27,21 +27,21 @@
             <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
             <property name="hibernate.generate_statistics" value="true"/>
 			<property name="hibernate.cache.region.factory_class" value="org.hibernate.testing.cache.CachingRegionFactory" />
-            <property name="hibernate.ejb.naming_strategy" value="org.hibernate.ejb.test.MyNamingStrategy"/>
+            <property name="hibernate.ejb.naming_strategy" value="org.hibernate.jpa.test.MyNamingStrategy"/>
             <!-- test naming strategy and fall back to element content -->
-            <!-- property name="hibernate.ejb.naming_strategy">org.hibernate.ejb.test.MyNamingStrategy</property -->
+            <!-- property name="hibernate.ejb.naming_strategy">MyNamingStrategy</property -->
 
             <!-- cache configuration -->
-            <property name="hibernate.ejb.classcache.org.hibernate.ejb.test.Item" value="read-write"/>
+            <property name="hibernate.ejb.classcache.org.hibernate.jpa.test.Item" value="read-write"/>
-            <property name="hibernate.ejb.collectioncache.org.hibernate.ejb.test.Item.distributors"
+            <property name="hibernate.ejb.collectioncache.org.hibernate.jpa.test.Item.distributors"
                       value="read-write, RegionName"/>
 
             <!-- event overriding -->
-            <property name="hibernate.ejb.event.pre-insert" value="org.hibernate.ejb.test.NoOpListener"/>
+            <property name="hibernate.ejb.event.pre-insert" value="org.hibernate.jpa.test.NoOpListener"/>
             <!-- remove JACC and validator -->
 
             <!-- alternatively to <class> and <property> declarations, you can use a regular hibernate.cfg.xml file -->
-            <!-- property name="hibernate.ejb.cfgfile" value="/org/hibernate/ejb/test/hibernate.cfg.xml"/ -->
+            <!-- property name="hibernate.ejb.cfgfile" value="/resource-path/to/hibernate.cfg.xml"/ -->
         </properties>
     </persistence-unit>
 </persistence>

hibernate-entitymanager/src/test/bundles/explodedpar/org/hibernate/jpa/test/pack/explodedpar/Elephant.hbm.xml

@@ -3,7 +3,7 @@
         "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
         "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
-<hibernate-mapping package="org.hibernate.ejb.test.pack.explodedpar">
+<hibernate-mapping package="org.hibernate.jpa.test.pack.explodedpar">
     <class name="Elephant">
         <id name="id">
             <generator class="native"/>

hibernate-entitymanager/src/test/bundles/externaljar/META-INF/orm.xml

@@ -5,7 +5,7 @@
                  xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd"
                  version="2.0"
         >
-    <package>org.hibernate.ejb.test.pack.various</package>
+    <package>org.hibernate.jpa.test.pack.various</package>
     <entity class="Airplane" metadata-complete="true" access="PROPERTY">
         <attributes>
             <id name="serialNumber"/>

hibernate-entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/orm.xml

@@ -8,14 +8,14 @@
     <persistence-unit-metadata>
         <persistence-unit-defaults>
             <entity-listeners>
-                <entity-listener class="org.hibernate.ejb.test.pack.defaultpar.IncrementListener">
+                <entity-listener class="org.hibernate.jpa.test.pack.defaultpar.IncrementListener">
                     <pre-persist method-name="increment"/>
                 </entity-listener>
             </entity-listeners>
 
         </persistence-unit-defaults>
     </persistence-unit-metadata>
-    <package>org.hibernate.ejb.test.pack.defaultpar</package>
+    <package>org.hibernate.jpa.test.pack.defaultpar</package>
     <entity class="Lighter" access="FIELD" metadata-complete="true">
         <attributes>
             <id name="name">

hibernate-entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml

@@ -5,7 +5,7 @@
              xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
              version="2.0">
     <persistence-unit name="defaultpar">
-        <class>org.hibernate.ejb.test.pack.defaultpar.Lighter</class>
+        <class>org.hibernate.jpa.test.pack.defaultpar.Lighter</class>
         <properties>
             <property name="hibernate.dialect" value="@db.dialect@"/>
             <property name="hibernate.connection.driver_class" value="@jdbc.driver@"/>

hibernate-entitymanager/src/test/bundles/war/WEB-INF/classes/org/hibernate/jpa/test/pack/war/Mouse.hbm.xml

@@ -3,12 +3,9 @@
         "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
         "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
-<hibernate-mapping
+<hibernate-mapping package="org.hibernate.jpa.test.pack.war">
-        package="org.hibernate.ejb.test.pack.war"
-        >
 
     <class name="Mouse">
-
         <id name="id">
             <generator class="native"/>
         </id>

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/package-info.java

@@ -1,4 +0,0 @@
-@NamedQuery(name = "allMouse",
-		query = "select m from ApplicationServer m") package org.hibernate.ejb.test.pack.defaultpar;
-import org.hibernate.annotations.NamedQuery;
-

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/package-info.java

@@ -1,5 +0,0 @@
-@NamedQuery(name = "allMouse_1_0",
-		query = "select m from ApplicationServer1 m")
-package org.hibernate.ejb.test.pack.defaultpar_1_0;
-import org.hibernate.annotations.NamedQuery;
-

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/explodedpar/package-info.java

@@ -1,3 +0,0 @@
-@NamedQuery(name = "allCarpet", query = "select c from Carpet c") package org.hibernate.ejb.test.pack.explodedpar;
-import org.hibernate.annotations.NamedQuery;
-

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/package-info.java

@@ -1,5 +0,0 @@
-@NamedQuery(name = "allMouse",
-		query = "select m from ApplicationServer m")
-package org.hibernate.ejb.test.pack.war;
-import org.hibernate.annotations.NamedQuery;
-

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/BaseEntityManagerFunctionalTestCase.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test;
+package org.hibernate.jpa.test;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/Cat.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test;
+package org.hibernate.jpa.test;
 
 import java.io.Serializable;
 import java.util.ArrayList;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/CompositeId.java

@@ -1,4 +1,4 @@
-package org.hibernate.ejb.test;
+package org.hibernate.jpa.test;
 
 import java.io.Serializable;
 import javax.persistence.Embeddable;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/CountEntityWithCompositeIdTest.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test;
+package org.hibernate.jpa.test;
 
 import javax.persistence.EntityManager;
 import javax.persistence.criteria.CriteriaBuilder;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/Distributor.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test;
+package org.hibernate.jpa.test;
 import java.io.Serializable;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/EntityManagerTest.java

@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test;
+package org.hibernate.jpa.test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/EntityWithCompositeId.java

@@ -1,4 +1,4 @@
-package org.hibernate.ejb.test;
+package org.hibernate.jpa.test;
 
 import java.io.Serializable;
 import javax.persistence.EmbeddedId;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/Item.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test;
+package org.hibernate.jpa.test;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
@@ -24,7 +24,7 @@ import org.hibernate.annotations.QueryHints;
  */
 @Entity(name = "Item")
 @SqlResultSetMapping(name = "getItem", entities =
-	@EntityResult(entityClass = org.hibernate.ejb.test.Item.class, fields = {
+	@EntityResult(entityClass = Item.class, fields = {
 		@FieldResult(name = "name", column = "itemname"),
 		@FieldResult(name = "descr", column = "itemdescription")
 	})

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/Kitten.java

@@ -1,5 +1,5 @@
 // $Id$
-package org.hibernate.ejb.test;
+package org.hibernate.jpa.test;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/LastUpdateListener.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test;
+package org.hibernate.jpa.test;
 import java.util.Date;
 import javax.persistence.PrePersist;
 import javax.persistence.PreUpdate;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/MyNamingStrategy.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test;
+package org.hibernate.jpa.test;
 import org.hibernate.cfg.EJB3NamingStrategy;
 
 /**

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/NoOpListener.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test;
+package org.hibernate.jpa.test;
 import org.hibernate.event.spi.PreInsertEvent;
 import org.hibernate.event.spi.PreInsertEventListener;
 

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/NotSerializableClass.java

@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
-package org.hibernate.ejb.test;
+package org.hibernate.jpa.test;
 
 /**
  * Attempts to serialize this class should cause a NotSerializableException error to be thrown.

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/PersistenceUnitDescriptorAdapter.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test;
+package org.hibernate.jpa.test;
 
 import javax.persistence.SharedCacheMode;
 import javax.persistence.ValidationMode;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/PersistenceUnitInfoAdapter.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test;
+package org.hibernate.jpa.test;
 
 import java.net.URL;
 import java.util.Collections;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/SettingsGenerator.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test;
+package org.hibernate.jpa.test;
 
 import java.util.HashMap;
 import java.util.Map;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/TestingEntityManagerFactoryGenerator.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test;
+package org.hibernate.jpa.test;
 
 import javax.persistence.EntityManagerFactory;
 import java.util.Map;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/Wallet.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test;
+package org.hibernate.jpa.test;
 import java.io.Serializable;
 import java.util.Date;
 import javax.persistence.Entity;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/association/AssociationTest.java

@@ -1,10 +1,10 @@
-package org.hibernate.ejb.test.association;
+package org.hibernate.jpa.test.association;
 
 import javax.persistence.EntityManager;
 
 import org.junit.Test;
 
-import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 
 /**
  * @author Emmanuel Bernard

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/association/Incident.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.association;
+package org.hibernate.jpa.test.association;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/association/IncidentStatus.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.association;
+package org.hibernate.jpa.test.association;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/association/Kitchen.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.association;
+package org.hibernate.jpa.test.association;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/association/Oven.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.association;
+package org.hibernate.jpa.test.association;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/beanvalidation/BeanValidationTest.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.beanvalidation;
+package org.hibernate.jpa.test.beanvalidation;
 
 import java.math.BigDecimal;
 import javax.persistence.EntityManager;
@@ -30,7 +30,7 @@ import javax.validation.ConstraintViolationException;
 
 import org.junit.Test;
 
-import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/beanvalidation/CupHolder.java

@@ -1,4 +1,4 @@
-package org.hibernate.ejb.test.beanvalidation;
+package org.hibernate.jpa.test.beanvalidation;
 import java.math.BigDecimal;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/boot/NewBootProcessTest.java

@@ -21,13 +21,13 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.boot;
+package org.hibernate.jpa.test.boot;
 
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.hibernate.ejb.test.jee.OrmVersionTest;
+import org.hibernate.jpa.test.jee.OrmVersionTest;
 import org.hibernate.jpa.HibernatePersistenceProvider;
 
 import org.junit.Test;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cacheable/annotation/ConfigurationTest.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cacheable.annotation;
+package org.hibernate.jpa.test.cacheable.annotation;
 
 import javax.persistence.SharedCacheMode;
 import java.util.Arrays;
@@ -32,7 +32,7 @@ import org.hibernate.cache.internal.NoCachingRegionFactory;
 import org.hibernate.cache.spi.access.AccessType;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
-import org.hibernate.ejb.test.PersistenceUnitInfoAdapter;
+import org.hibernate.jpa.test.PersistenceUnitInfoAdapter;
 import org.hibernate.jpa.AvailableSettings;
 import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
 import org.hibernate.jpa.boot.spi.Bootstrap;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cacheable/annotation/ExplicitlyCacheableEntity.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cacheable.annotation;
+package org.hibernate.jpa.test.cacheable.annotation;
 import javax.persistence.Cacheable;
 import javax.persistence.Entity;
 import javax.persistence.Id;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cacheable/annotation/ExplicitlyNonCacheableEntity.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cacheable.annotation;
+package org.hibernate.jpa.test.cacheable.annotation;
 import javax.persistence.Cacheable;
 import javax.persistence.Entity;
 import javax.persistence.Id;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cacheable/annotation/NoCacheableAnnotationEntity.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cacheable.annotation;
+package org.hibernate.jpa.test.cacheable.annotation;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cacheable/cachemodes/SharedCacheModesTest.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cacheable.cachemodes;
+package org.hibernate.jpa.test.cacheable.cachemodes;
 
 import javax.persistence.CacheRetrieveMode;
 import javax.persistence.CacheStoreMode;
@@ -35,7 +35,7 @@ import org.hibernate.Session;
 import org.hibernate.ejb.AvailableSettings;
 import org.hibernate.ejb.HibernateEntityManager;
 import org.hibernate.ejb.HibernateQuery;
-import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 import org.hibernate.internal.AbstractQueryImpl;
 
 import static org.junit.Assert.assertEquals;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cacheable/cachemodes/SimpleEntity.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cacheable.cachemodes;
+package org.hibernate.jpa.test.cacheable.cachemodes;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/callbacks/CallbackAndDirtyTest.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.callbacks;
+package org.hibernate.jpa.test.callbacks;
 
 import java.util.Iterator;
 import java.util.List;
@@ -29,7 +29,7 @@ import javax.persistence.EntityManager;
 
 import org.junit.Test;
 
-import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/callbacks/CallbacksTest.java

@@ -1,4 +1,4 @@
-package org.hibernate.ejb.test.callbacks;
+package org.hibernate.jpa.test.callbacks;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -7,9 +7,10 @@ import javax.persistence.EntityManager;
 
 import org.junit.Test;
 
-import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
-import org.hibernate.ejb.test.Cat;
+import org.hibernate.jpa.test.Cat;
-import org.hibernate.ejb.test.Kitten;
+import org.hibernate.jpa.test.Kitten;
+
 import org.hibernate.testing.FailureExpected;
 
 import static org.junit.Assert.assertEquals;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/callbacks/CommunicationSystem.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.callbacks;
+package org.hibernate.jpa.test.callbacks;
 import javax.persistence.EntityListeners;
 import javax.persistence.MappedSuperclass;
 

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/callbacks/CountryChecker.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.callbacks;
+package org.hibernate.jpa.test.callbacks;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/callbacks/CountryNameCheckerListener.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.callbacks;
+package org.hibernate.jpa.test.callbacks;
 import java.util.ArrayList;
 import java.util.List;
 import javax.persistence.PrePersist;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/callbacks/Customer.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.callbacks;
+package org.hibernate.jpa.test.callbacks;
 import javax.persistence.Entity;
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/callbacks/Employee.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.callbacks;
+package org.hibernate.jpa.test.callbacks;
 import java.math.BigDecimal;
 import javax.persistence.Entity;
 import javax.persistence.Inheritance;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/callbacks/ExceptionListener.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.callbacks;
+package org.hibernate.jpa.test.callbacks;
 import javax.persistence.PrePersist;
 
 /**

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/callbacks/FirstOneListener.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.callbacks;
+package org.hibernate.jpa.test.callbacks;
 import javax.persistence.PreUpdate;
 
 /**

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/callbacks/IncreaseListener.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.callbacks;
+package org.hibernate.jpa.test.callbacks;
 import javax.persistence.PreUpdate;
 
 /**

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/callbacks/Person.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.callbacks;
+package org.hibernate.jpa.test.callbacks;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/callbacks/Plant.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.callbacks;
+package org.hibernate.jpa.test.callbacks;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.PrePersist;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/callbacks/RemoteControl.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.callbacks;
+package org.hibernate.jpa.test.callbacks;
 import java.util.Date;
 import javax.persistence.Basic;
 import javax.persistence.Entity;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/callbacks/Rythm.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.callbacks;
+package org.hibernate.jpa.test.callbacks;
 import javax.persistence.Entity;
 import javax.persistence.EntityListeners;
 import javax.persistence.GeneratedValue;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/callbacks/Television.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.callbacks;
+package org.hibernate.jpa.test.callbacks;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.EntityListeners;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/callbacks/Translation.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.callbacks;
+package org.hibernate.jpa.test.callbacks;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/callbacks/VideoSystem.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.callbacks;
+package org.hibernate.jpa.test.callbacks;
 import javax.persistence.EntityListeners;
 import javax.persistence.ExcludeSuperclassListeners;
 import javax.persistence.MappedSuperclass;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/Author.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.cascade;
+package org.hibernate.jpa.test.cascade;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/CascadeTest.java

@@ -21,14 +21,14 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cascade;
+package org.hibernate.jpa.test.cascade;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 
 import org.junit.Test;
 
-import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 
 /**
  * @author Max Rydahl Andersen

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/Conference.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.cascade;
+package org.hibernate.jpa.test.cascade;
 import java.io.Serializable;
 import java.util.Date;
 import javax.persistence.CascadeType;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/DeleteOrphanTest.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cascade;
+package org.hibernate.jpa.test.cascade;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -36,7 +36,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import org.hibernate.Hibernate;
-import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 
 /**
  * @author Emmanuel Bernard

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/DetachAndContainsTest.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cascade;
+package org.hibernate.jpa.test.cascade;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -34,7 +34,7 @@ import javax.persistence.OneToMany;
 
 import org.junit.Test;
 
-import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 
 import static javax.persistence.CascadeType.DETACH;
 import static javax.persistence.CascadeType.REMOVE;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/ExtractionDocument.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.cascade;
+package org.hibernate.jpa.test.cascade;
 
 import java.io.Serializable;
 import javax.persistence.Column;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/ExtractionDocumentInfo.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.cascade;
+package org.hibernate.jpa.test.cascade;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/FetchTest.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cascade;
+package org.hibernate.jpa.test.cascade;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -33,7 +33,7 @@ import org.junit.Test;
 
 import org.hibernate.Hibernate;
 import org.hibernate.ejb.HibernateEntityManager;
-import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/FetchTest2.java

@@ -21,13 +21,13 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cascade;
+package org.hibernate.jpa.test.cascade;
 
 import javax.persistence.EntityManager;
 
 import org.junit.Test;
 
-import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 
 import static org.junit.Assert.fail;
 

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/Grandson.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.cascade;
+package org.hibernate.jpa.test.cascade;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/Parent.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.cascade;
+package org.hibernate.jpa.test.cascade;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/Soldier.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.cascade;
+package org.hibernate.jpa.test.cascade;
 import java.io.Serializable;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/Soldier2.java

@@ -1,4 +1,4 @@
-package org.hibernate.ejb.test.cascade;
+package org.hibernate.jpa.test.cascade;
 import java.io.Serializable;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/Son.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.cascade;
+package org.hibernate.jpa.test.cascade;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/Song.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.cascade;
+package org.hibernate.jpa.test.cascade;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/Student.java

@@ -1,4 +1,4 @@
-package org.hibernate.ejb.test.cascade;
+package org.hibernate.jpa.test.cascade;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/Teacher.java

@@ -1,4 +1,4 @@
-package org.hibernate.ejb.test.cascade;
+package org.hibernate.jpa.test.cascade;
 
 import java.util.HashSet;
 import java.util.Set;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/Troop.java

@@ -1,5 +1,5 @@
 //$Id$
-package org.hibernate.ejb.test.cascade;
+package org.hibernate.jpa.test.cascade;
 
 import java.io.Serializable;
 import java.util.HashSet;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/Troop2.java

@@ -1,4 +1,4 @@
-package org.hibernate.ejb.test.cascade;
+package org.hibernate.jpa.test.cascade;
 import java.io.Serializable;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/multicircle/AbstractEntity.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cascade.multicircle;
+package org.hibernate.jpa.test.cascade.multicircle;
 
 import java.io.Serializable;
 import java.util.Date;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/multicircle/B.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cascade.multicircle;
+package org.hibernate.jpa.test.cascade.multicircle;
 
 /**
  * No Documentation

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/multicircle/C.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cascade.multicircle;
+package org.hibernate.jpa.test.cascade.multicircle;
 
 import java.util.Set;
 

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/multicircle/D.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cascade.multicircle;
+package org.hibernate.jpa.test.cascade.multicircle;
 
 /**
  * No Documentation

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/multicircle/E.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cascade.multicircle;
+package org.hibernate.jpa.test.cascade.multicircle;
 
 /**
  * No Documentation

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/multicircle/F.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cascade.multicircle;
+package org.hibernate.jpa.test.cascade.multicircle;
 
 /**
  * No Documentation

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/multicircle/G.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cascade.multicircle;
+package org.hibernate.jpa.test.cascade.multicircle;
 
 /**
  * No Documentation

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/multicircle/MultiCircleJpaCascadeTest.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cascade.multicircle;
+package org.hibernate.jpa.test.cascade.multicircle;
 
 import javax.persistence.EntityManager;
 import javax.persistence.RollbackException;
@@ -32,7 +32,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import org.hibernate.TransientPropertyValueException;
-import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 import org.hibernate.testing.FailureExpected;
 
 import static org.junit.Assert.assertEquals;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/multilevel/Bottom.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cascade.multilevel;
+package org.hibernate.jpa.test.cascade.multilevel;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/multilevel/Middle.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.cascade.multilevel;
+package org.hibernate.jpa.test.cascade.multilevel;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;