[Hibernate-commits] HibernateExt/metadata/test/org/hibernate/test/metadata A320.java,1.1,1.2 A320b.java,1.1,1.2 AmericaCupClass.java,1.1,1.2 Boat.java,1.3,1.4 Company.java,1.6,1.7 Country.java,1.3,1.4 Customer.java,1.8,1.9 Discount.java,1.5,1.6 Ferry.java,1.1,1.2 Flight.java,1.7,1.8 FlyingObject.java,1.2,1.3 Passport.java,1.3,1.4 Plane.java,1.5,1.6 Sky.java,1.5,1.6 Ticket.java,1.4,1.5 package-info.java,1.4,1.5

[<epb...@us...>]

Update of /cvsroot/hibernate/HibernateExt/metadata/test/org/hibernate/test/metadata
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21826/metadata/test/org/hibernate/test/metadata

Modified Files:
	A320.java A320b.java AmericaCupClass.java Boat.java 
	Company.java Country.java Customer.java Discount.java 
	Ferry.java Flight.java FlyingObject.java Passport.java 
	Plane.java Sky.java Ticket.java package-info.java 
Log Message:
Move javax.ejb.* into javax.persistence.*

Index: A320.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/test/org/hibernate/test/metadata/A320.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- A320.java	6 Oct 2004 23:59:56 -0000	1.1
+++ A320.java	28 Feb 2005 21:42:23 -0000	1.2
@@ -1,8 +1,8 @@
 //$Id$
 package org.hibernate.test.metadata;
 
-import javax.ejb.Entity;
-import javax.ejb.Inheritance;
+import javax.persistence.Entity;
+import javax.persistence.Inheritance;
 
 /**
  * @author Emmanuel Bernard

Index: A320b.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/test/org/hibernate/test/metadata/A320b.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- A320b.java	8 Oct 2004 22:55:30 -0000	1.1
+++ A320b.java	28 Feb 2005 21:42:24 -0000	1.2
@@ -1,7 +1,7 @@
 //$Id$
 package org.hibernate.test.metadata;
 
-import javax.ejb.Entity;
+import javax.persistence.Entity;
 
 /**
  * @author Emmanuel Bernard

Index: AmericaCupClass.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/test/org/hibernate/test/metadata/AmericaCupClass.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AmericaCupClass.java	9 Oct 2004 19:34:45 -0000	1.1
+++ AmericaCupClass.java	28 Feb 2005 21:42:24 -0000	1.2
@@ -1,13 +1,13 @@
 //$Id$
 package org.hibernate.test.metadata;
 
-import javax.ejb.Entity;
-import javax.ejb.Inheritance;
-import javax.ejb.InheritanceType;
-import javax.ejb.JoinColumn;
-import javax.ejb.ManyToOne;
-import javax.ejb.AccessType;
-import javax.ejb.InheritanceJoinColumn;
+import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.AccessType;
+import javax.persistence.InheritanceJoinColumn;
 
 /**
  * @author Emmanuel Bernard

Index: Boat.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/test/org/hibernate/test/metadata/Boat.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Boat.java	8 Dec 2004 20:05:15 -0000	1.3
+++ Boat.java	28 Feb 2005 21:42:24 -0000	1.4
@@ -1,13 +1,13 @@
 //$Id$
 package org.hibernate.test.metadata;
 
-import javax.ejb.Entity;
-import javax.ejb.Id;
-import javax.ejb.GeneratorType;
-import javax.ejb.Inheritance;
-import javax.ejb.InheritanceType;
-import javax.ejb.InheritanceJoinColumn;
-import javax.ejb.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratorType;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.InheritanceJoinColumn;
+import javax.persistence.Column;
 import java.io.Serializable;
 
 

Index: Company.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/test/org/hibernate/test/metadata/Company.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Company.java	24 Dec 2004 15:07:25 -0000	1.6
+++ Company.java	28 Feb 2005 21:42:24 -0000	1.7
@@ -1,10 +1,10 @@
 //$Id$
 package org.hibernate.test.metadata;
 
-import javax.ejb.Entity;
-import javax.ejb.Id;
-import javax.ejb.GeneratorType;
-import javax.ejb.Transient;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratorType;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 

Index: Country.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/test/org/hibernate/test/metadata/Country.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Country.java	8 Dec 2004 20:05:15 -0000	1.3
+++ Country.java	28 Feb 2005 21:42:24 -0000	1.4
@@ -5,9 +5,9 @@
  * @author Emmanuel Bernard
  */
 
-import javax.ejb.Entity;
-import javax.ejb.Id;
-import javax.ejb.GeneratorType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratorType;
 import java.io.Serializable;
 
 @Entity()

Index: Customer.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/test/org/hibernate/test/metadata/Customer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Customer.java	28 Dec 2004 22:19:27 -0000	1.8
+++ Customer.java	28 Feb 2005 21:42:24 -0000	1.9
@@ -4,15 +4,15 @@
 import java.util.Collection;
 import java.util.Set;
 import java.io.Serializable;
-import javax.ejb.Entity;
-import javax.ejb.Id;
-import javax.ejb.Column;
-import javax.ejb.OneToMany;
-import javax.ejb.JoinColumn;
-import javax.ejb.CascadeType;
-import javax.ejb.GeneratorType;
-import javax.ejb.OneToOne;
-import javax.ejb.FetchType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Column;
+import javax.persistence.OneToMany;
+import javax.persistence.JoinColumn;
+import javax.persistence.CascadeType;
+import javax.persistence.GeneratorType;
+import javax.persistence.OneToOne;
+import javax.persistence.FetchType;
 
 /**
  * Company customer

Index: Discount.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/test/org/hibernate/test/metadata/Discount.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Discount.java	2 Feb 2005 11:16:23 -0000	1.5
+++ Discount.java	28 Feb 2005 21:42:24 -0000	1.6
@@ -1,14 +1,14 @@
 //$Id$
 package org.hibernate.test.metadata;
 
-import javax.ejb.Entity;
-import javax.ejb.Id;
-import javax.ejb.GeneratorType;
-import javax.ejb.ManyToOne;
-import javax.ejb.JoinColumn;
-import javax.ejb.CascadeType;
-import javax.ejb.FetchType;
-import javax.ejb.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratorType;
+import javax.persistence.ManyToOne;
+import javax.persistence.JoinColumn;
+import javax.persistence.CascadeType;
+import javax.persistence.FetchType;
+import javax.persistence.Column;
 import java.io.Serializable;
 
 

Index: Ferry.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/test/org/hibernate/test/metadata/Ferry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Ferry.java	9 Oct 2004 19:34:45 -0000	1.1
+++ Ferry.java	28 Feb 2005 21:42:24 -0000	1.2
@@ -1,9 +1,9 @@
 //$Id$
 package org.hibernate.test.metadata;
 
-import javax.ejb.Entity;
-import javax.ejb.Inheritance;
-import javax.ejb.InheritanceType;
+import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 
 
 /**

Index: Flight.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/test/org/hibernate/test/metadata/Flight.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Flight.java	25 Jan 2005 00:20:39 -0000	1.7
+++ Flight.java	28 Feb 2005 21:42:24 -0000	1.8
@@ -1,18 +1,18 @@
 //$Id$
 package org.hibernate.test.metadata;
 
-import javax.ejb.Entity;
-import javax.ejb.Id;
-import javax.ejb.Column;
-import javax.ejb.JoinColumn;
-import javax.ejb.Basic;
-import javax.ejb.FetchType;
-import javax.ejb.Transient;
-import javax.ejb.Version;
-import javax.ejb.ManyToOne;
-import javax.ejb.CascadeType;
-import javax.ejb.Inheritance;
-import javax.ejb.InheritanceType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Column;
+import javax.persistence.JoinColumn;
+import javax.persistence.Basic;
+import javax.persistence.FetchType;
+import javax.persistence.Transient;
+import javax.persistence.Version;
+import javax.persistence.ManyToOne;
+import javax.persistence.CascadeType;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import java.io.Serializable;
 
 /**

Index: FlyingObject.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/test/org/hibernate/test/metadata/FlyingObject.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FlyingObject.java	5 Dec 2004 21:30:23 -0000	1.2
+++ FlyingObject.java	28 Feb 2005 21:42:24 -0000	1.3
@@ -1,7 +1,7 @@
 //$Id$
 package org.hibernate.test.metadata;
 
-import javax.ejb.Transient;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**

Index: Passport.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/test/org/hibernate/test/metadata/Passport.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Passport.java	8 Dec 2004 20:05:15 -0000	1.3
+++ Passport.java	28 Feb 2005 21:42:24 -0000	1.4
@@ -1,11 +1,11 @@
 //$Id$
 package org.hibernate.test.metadata;
 
-import javax.ejb.Entity;
-import javax.ejb.Id;
-import javax.ejb.GeneratorType;
-import javax.ejb.OneToOne;
-import javax.ejb.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratorType;
+import javax.persistence.OneToOne;
+import javax.persistence.Column;
 import java.io.Serializable;
 
 /**

Index: Plane.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/test/org/hibernate/test/metadata/Plane.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Plane.java	28 Dec 2004 22:19:27 -0000	1.5
+++ Plane.java	28 Feb 2005 21:42:24 -0000	1.6
@@ -1,13 +1,13 @@
 //$Id$
 package org.hibernate.test.metadata;
 
-import javax.ejb.Entity;
-import javax.ejb.Id;
-import javax.ejb.GeneratorType;
-import javax.ejb.Inheritance;
-import javax.ejb.InheritanceType;
-import javax.ejb.DiscriminatorType;
-import javax.ejb.DiscriminatorColumn;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratorType;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.DiscriminatorType;
+import javax.persistence.DiscriminatorColumn;
 
 /**
  * Plane class

Index: Sky.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/test/org/hibernate/test/metadata/Sky.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Sky.java	25 Jan 2005 00:20:51 -0000	1.5
+++ Sky.java	28 Feb 2005 21:42:24 -0000	1.6
@@ -1,12 +1,12 @@
 //$Id$
 package org.hibernate.test.metadata;
 
-import javax.ejb.Entity;
-import javax.ejb.Id;
-import javax.ejb.AccessType;
-import javax.ejb.Table;
-import javax.ejb.Column;
-import javax.ejb.UniqueConstraint;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.AccessType;
+import javax.persistence.Table;
+import javax.persistence.Column;
+import javax.persistence.UniqueConstraint;
 import java.io.Serializable;
 
 /**

Index: Ticket.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/test/org/hibernate/test/metadata/Ticket.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Ticket.java	8 Dec 2004 20:05:15 -0000	1.4
+++ Ticket.java	28 Feb 2005 21:42:24 -0000	1.5
@@ -1,13 +1,13 @@
 //$Id$
 package org.hibernate.test.metadata;
 
-import javax.ejb.Entity;
-import javax.ejb.Id;
-import javax.ejb.ManyToOne;
-import javax.ejb.JoinColumn;
-import javax.ejb.CascadeType;
-import javax.ejb.GeneratorType;
-import javax.ejb.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.JoinColumn;
+import javax.persistence.CascadeType;
+import javax.persistence.GeneratorType;
+import javax.persistence.Column;
 import java.io.Serializable;
 
 /**

Index: package-info.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/test/org/hibernate/test/metadata/package-info.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- package-info.java	18 Jan 2005 01:00:28 -0000	1.4
+++ package-info.java	28 Feb 2005 21:42:24 -0000	1.5
@@ -4,22 +4,22 @@
  */
 
 
-@javax.ejb.TableGenerator(
+...@ja...rsistence.TableGenerator(
 	name="EMP_GEN",
 	tableName="GEN_TABLE",
 	pkColumnValue="EMP",
 	allocationSize=20
 )
-...@ja...neratorTable(
+...@ja...neratorTable(
 	name="GEN_TABLE",
 	table = @Table(name="GENERATOR_TABLE"),
 	pkColumnName = "key",
 	valueColumnName = "hi"
 )
-...@ja...quenceGenerator(
+...@ja...quenceGenerator(
 	name="SEQ_GEN",
 	sequenceName="my_sequence"
 )
 package org.hibernate.test.metadata;
 
-import javax.ejb.Table;
+import javax.persistence.Table;