[hibernate-commits] Hibernate SVN: r19093 - in entitymanager/branches/v3_4_0_GA_CP/src: main/java/org/hibernate/ejb/connection and 24 other directories.

Author: stliu Date: 2010-03-23 17:24:49 -0400 (Tue, 23 Mar 2010) New Revision: 19093 Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/CurrentEntityManagerImpl.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Ejb3Configuration.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/EntityManagerImpl.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/HibernateEntityManagerFactory.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/HibernatePersistence.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/QueryImpl.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/TransactionImpl.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/BeanCallback.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/CallbackResolver.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3MergeEventListener.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3PersistEventListener.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3SaveEventListener.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/ListenerCallback.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/JarVisitor.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/util/LogHelper.java entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/engine/EJB3CascadingAction.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Distributor.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Item.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/LastUpdateListener.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/NoOpListener.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/QueryTest.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Wallet.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/association/Oven.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CountryChecker.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CountryNameCheckerListener.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Employee.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Plant.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/RemoteControl.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Rythm.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Television.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/VideoSystem.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Conference.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocument.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocumentInfo.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/FetchTest.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Soldier.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Soldier2.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Troop.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Troop2.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/FakeDataSource.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Colony.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Competition.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Competitor.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Dress.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Empire.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/FlushModeTest.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/MergeTest.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Music.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Race.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/RemoveTest.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/A.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/B1.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/B2.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/exception/Music.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/inheritance/Fruit.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lob/BlobTest.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lob/ImageReader.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lock/UnversionedLock.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/Animal.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/GetLoadTest.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/MergeTest.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Money.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/war/Money.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/Article.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/CounterListener.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/sequences/Article.java Log: clean up unused imports Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/CurrentEntityManagerImpl.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/CurrentEntityManagerImpl.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/CurrentEntityManagerImpl.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,6 +2,7 @@ package org.hibernate.ejb; import java.util.Map; + import javax.persistence.PersistenceContextType; import javax.persistence.spi.PersistenceUnitTransactionType; Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Ejb3Configuration.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Ejb3Configuration.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Ejb3Configuration.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -21,6 +21,7 @@ import java.util.Properties; import java.util.Set; import java.util.StringTokenizer; + import javax.naming.BinaryRefAddr; import javax.naming.NamingException; import javax.naming.Reference; @@ -52,16 +53,16 @@ import org.hibernate.cfg.annotations.reflection.XMLContext; import org.hibernate.ejb.connection.InjectedDataSourceConnectionProvider; import org.hibernate.ejb.instrument.InterceptFieldClassFileTransformer; +import org.hibernate.ejb.packaging.ClassFilter; +import org.hibernate.ejb.packaging.Entry; +import org.hibernate.ejb.packaging.FileFilter; +import org.hibernate.ejb.packaging.Filter; import org.hibernate.ejb.packaging.JarVisitor; +import org.hibernate.ejb.packaging.JarVisitorFactory; import org.hibernate.ejb.packaging.NamedInputStream; +import org.hibernate.ejb.packaging.PackageFilter; import org.hibernate.ejb.packaging.PersistenceMetadata; import org.hibernate.ejb.packaging.PersistenceXmlLoader; -import org.hibernate.ejb.packaging.Filter; -import org.hibernate.ejb.packaging.JarVisitorFactory; -import org.hibernate.ejb.packaging.Entry; -import org.hibernate.ejb.packaging.FileFilter; -import org.hibernate.ejb.packaging.PackageFilter; -import org.hibernate.ejb.packaging.ClassFilter; import org.hibernate.ejb.transaction.JoinableCMTTransactionFactory; import org.hibernate.ejb.util.ConfigurationHelper; import org.hibernate.ejb.util.LogHelper; @@ -77,10 +78,10 @@ import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; import org.hibernate.util.XMLHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.xml.sax.EntityResolver; import org.xml.sax.SAXException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Allow a fine tuned configuration of an EJB 3.0 EntityManagerFactory Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -4,6 +4,7 @@ import java.io.ByteArrayInputStream; import java.io.ObjectInputStream; import java.util.Hashtable; + import javax.naming.Context; import javax.naming.Name; import javax.naming.Reference; Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,6 +2,7 @@ package org.hibernate.ejb; import java.util.Map; + import javax.persistence.EntityManager; import javax.persistence.PersistenceContextType; import javax.persistence.spi.PersistenceUnitTransactionType; Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/EntityManagerImpl.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/EntityManagerImpl.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/EntityManagerImpl.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,15 +2,16 @@ package org.hibernate.ejb; import java.util.Map; + import javax.persistence.PersistenceContextType; import javax.persistence.PersistenceException; import javax.persistence.spi.PersistenceUnitTransactionType; import javax.transaction.Synchronization; import org.hibernate.HibernateException; +import org.hibernate.Interceptor; import org.hibernate.Session; import org.hibernate.SessionFactory; -import org.hibernate.Interceptor; import org.hibernate.annotations.common.util.ReflectHelper; import org.hibernate.cfg.Environment; import org.hibernate.engine.SessionImplementor; Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/HibernateEntityManagerFactory.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/HibernateEntityManagerFactory.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/HibernateEntityManagerFactory.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,6 +2,7 @@ package org.hibernate.ejb; import java.io.Serializable; + import javax.persistence.EntityManagerFactory; import org.hibernate.SessionFactory; Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/HibernatePersistence.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/HibernatePersistence.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/HibernatePersistence.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,6 +2,7 @@ package org.hibernate.ejb; import java.util.Map; + import javax.persistence.EntityManagerFactory; import javax.persistence.spi.PersistenceUnitInfo; Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/QueryImpl.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/QueryImpl.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/QueryImpl.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -23,18 +23,22 @@ */ package org.hibernate.ejb; +import static javax.persistence.TemporalType.DATE; +import static javax.persistence.TemporalType.TIME; +import static javax.persistence.TemporalType.TIMESTAMP; + import java.util.Calendar; import java.util.Collection; import java.util.Date; +import java.util.HashSet; import java.util.List; -import java.util.HashSet; import java.util.Set; + import javax.persistence.FlushModeType; import javax.persistence.NoResultException; import javax.persistence.NonUniqueResultException; import javax.persistence.Query; import javax.persistence.TemporalType; -import static javax.persistence.TemporalType.*; import javax.persistence.TransactionRequiredException; import org.hibernate.FlushMode; @@ -42,9 +46,9 @@ import org.hibernate.QueryParameterException; import org.hibernate.SQLQuery; import org.hibernate.TypeMismatchException; -import org.hibernate.impl.AbstractQueryImpl; import org.hibernate.ejb.util.ConfigurationHelper; import org.hibernate.hql.QueryExecutionRequestException; +import org.hibernate.impl.AbstractQueryImpl; /** * @author <a href="mailto:gavin@hibernate.org">Gavin King</a> Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/TransactionImpl.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/TransactionImpl.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/TransactionImpl.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -7,8 +7,8 @@ import org.hibernate.HibernateException; import org.hibernate.Session; +import org.hibernate.StaleStateException; import org.hibernate.Transaction; -import org.hibernate.StaleStateException; /** * @author Gavin King Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -1,16 +1,17 @@ //$Id$ package org.hibernate.ejb.connection; -import java.util.Properties; import java.sql.Connection; import java.sql.SQLException; +import java.util.Properties; + import javax.sql.DataSource; import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; import org.hibernate.connection.DatasourceConnectionProvider; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.slf4j.Logger; /** * A connection provider that uses an injected <tt>DataSource</tt>. Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/BeanCallback.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/BeanCallback.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/BeanCallback.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -6,8 +6,8 @@ */ package org.hibernate.ejb.event; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.lang.reflect.InvocationTargetException; /** * @author <a href="mailto:kabir.khan@jboss.org">Kabir Khan</a> Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/CallbackResolver.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/CallbackResolver.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/CallbackResolver.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -13,6 +13,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; + import javax.persistence.Entity; import javax.persistence.EntityListeners; import javax.persistence.ExcludeDefaultListeners; Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -3,8 +3,8 @@ import java.io.Serializable; +import org.hibernate.event.DeleteEvent; import org.hibernate.event.EventSource; -import org.hibernate.event.DeleteEvent; import org.hibernate.event.def.DefaultDeleteEventListener; import org.hibernate.persister.entity.EntityPersister; Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3MergeEventListener.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3MergeEventListener.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3MergeEventListener.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -5,7 +5,6 @@ import org.hibernate.event.EventSource; import org.hibernate.event.def.DefaultMergeEventListener; -import org.hibernate.persister.entity.EntityPersister; /** * Overrides the LifeCycle OnSave call to call the PrePersist operation Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3PersistEventListener.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3PersistEventListener.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3PersistEventListener.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -3,11 +3,11 @@ import java.io.Serializable; +import org.hibernate.engine.CascadingAction; +import org.hibernate.engine.EJB3CascadeStyle; +import org.hibernate.engine.EJB3CascadingAction; import org.hibernate.event.EventSource; import org.hibernate.event.def.DefaultPersistEventListener; -import org.hibernate.engine.CascadingAction; -import org.hibernate.engine.EJB3CascadingAction; -import org.hibernate.engine.EJB3CascadeStyle; /** * Overrides the LifeCycle OnSave call to call the PrePersist operation Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3SaveEventListener.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3SaveEventListener.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3SaveEventListener.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -5,7 +5,6 @@ import org.hibernate.event.EventSource; import org.hibernate.event.def.DefaultSaveEventListener; -import org.hibernate.persister.entity.EntityPersister; /** * Overrides the LifeCycle OnSave call to call the PrePersist operation Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -5,7 +5,6 @@ import org.hibernate.event.EventSource; import org.hibernate.event.def.DefaultSaveOrUpdateEventListener; -import org.hibernate.persister.entity.EntityPersister; /** * Overrides the LifeCycle OnSave call to call the PrePersist operation Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -9,6 +9,7 @@ import java.io.Serializable; import java.util.HashMap; + import javax.persistence.PostLoad; import javax.persistence.PostPersist; import javax.persistence.PostRemove; @@ -17,8 +18,8 @@ import javax.persistence.PreRemove; import javax.persistence.PreUpdate; +import org.hibernate.annotations.common.reflection.ReflectionManager; import org.hibernate.annotations.common.reflection.XClass; -import org.hibernate.annotations.common.reflection.ReflectionManager; /** * Keep track of all lifecycle callbacks and listeners for a given persistence unit Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/ListenerCallback.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/ListenerCallback.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/event/ListenerCallback.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -9,8 +9,8 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.lang.reflect.InvocationTargetException; import org.hibernate.util.ReflectHelper; Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -12,6 +12,7 @@ import javassist.bytecode.AnnotationsAttribute; import javassist.bytecode.ClassFile; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -11,8 +11,8 @@ import java.util.jar.JarFile; import java.util.zip.ZipEntry; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.slf4j.Logger; /** Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,12 +2,11 @@ package org.hibernate.ejb.packaging; import java.io.BufferedInputStream; +import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.net.URL; import java.net.URISyntaxException; +import java.net.URL; import java.util.Enumeration; import java.util.jar.JarFile; import java.util.jar.JarInputStream; Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/JarVisitor.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/JarVisitor.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/JarVisitor.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -1,8 +1,8 @@ // $Id$ package org.hibernate.ejb.packaging; +import java.io.IOException; import java.util.Set; -import java.io.IOException; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -1,12 +1,12 @@ package org.hibernate.ejb.packaging; -import java.io.InputStream; import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Properties; import java.util.Set; -import java.util.Map; + import javax.persistence.spi.PersistenceUnitTransactionType; /** Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -8,6 +8,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; + import javax.persistence.PersistenceException; import javax.persistence.spi.PersistenceUnitTransactionType; import javax.xml.parsers.DocumentBuilder; @@ -17,6 +18,8 @@ import org.hibernate.ejb.HibernatePersistence; import org.hibernate.ejb.util.ConfigurationHelper; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -25,8 +28,6 @@ import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXParseException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Persistence.xml handler Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -8,9 +8,9 @@ import javax.persistence.FlushModeType; import javax.persistence.PersistenceException; -import org.hibernate.FlushMode; import org.hibernate.AssertionFailure; import org.hibernate.CacheMode; +import org.hibernate.FlushMode; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/util/LogHelper.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/util/LogHelper.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/util/LogHelper.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -5,6 +5,7 @@ import java.util.Enumeration; import java.util.List; import java.util.Properties; + import javax.persistence.spi.PersistenceUnitInfo; /** Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/engine/EJB3CascadingAction.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/engine/EJB3CascadingAction.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/engine/EJB3CascadingAction.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -1,14 +1,14 @@ //$Id: $ package org.hibernate.engine; +import java.util.Iterator; import java.util.Map; -import java.util.Iterator; +import org.hibernate.HibernateException; import org.hibernate.event.EventSource; -import org.hibernate.HibernateException; import org.hibernate.type.CollectionType; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.slf4j.Logger; /** * Because of CascadingAction constructor visibility Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Distributor.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Distributor.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Distributor.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,6 +2,7 @@ package org.hibernate.ejb.test; import java.io.Serializable; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -9,6 +9,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; + import javax.persistence.EntityManager; import javax.persistence.FlushModeType; import javax.persistence.Query; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Item.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Item.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Item.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.EntityResult; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/LastUpdateListener.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/LastUpdateListener.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/LastUpdateListener.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,6 +2,7 @@ package org.hibernate.ejb.test; import java.util.Date; + import javax.persistence.PrePersist; import javax.persistence.PreUpdate; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/NoOpListener.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/NoOpListener.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/NoOpListener.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -1,8 +1,8 @@ //$Id: $ package org.hibernate.ejb.test; +import org.hibernate.event.PreInsertEvent; import org.hibernate.event.PreInsertEventListener; -import org.hibernate.event.PreInsertEvent; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/QueryTest.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/QueryTest.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/QueryTest.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; + import javax.persistence.EntityManager; import javax.persistence.Query; import javax.persistence.TemporalType; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Wallet.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Wallet.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/Wallet.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -3,6 +3,7 @@ import java.io.Serializable; import java.util.Date; + import javax.persistence.Entity; import javax.persistence.Id; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/association/Oven.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/association/Oven.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/association/Oven.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,11 +2,11 @@ package org.hibernate.ejb.test.association; import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.JoinColumn; import javax.persistence.OneToOne; -import javax.persistence.JoinColumn; -import javax.persistence.Id; -import javax.persistence.GeneratedValue; -import javax.persistence.FetchType; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -3,6 +3,7 @@ import java.util.Iterator; import java.util.List; + import javax.persistence.EntityManager; import org.hibernate.ejb.test.TestCase; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CountryChecker.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CountryChecker.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CountryChecker.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -5,6 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.persistence.EntityListeners; /** Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CountryNameCheckerListener.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CountryNameCheckerListener.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/CountryNameCheckerListener.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.List; + import javax.persistence.PrePersist; import javax.persistence.PreUpdate; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Employee.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Employee.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Employee.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,6 +2,7 @@ package org.hibernate.ejb.test.callbacks; import java.math.BigDecimal; + import javax.persistence.Entity; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Plant.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Plant.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Plant.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -1,8 +1,8 @@ //$Id: $ package org.hibernate.ejb.test.callbacks; +import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.Entity; import javax.persistence.PrePersist; /** Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/RemoteControl.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/RemoteControl.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/RemoteControl.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,6 +2,7 @@ package org.hibernate.ejb.test.callbacks; import java.util.Date; + import javax.persistence.Basic; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Rythm.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Rythm.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Rythm.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -1,10 +1,10 @@ //$Id: $ package org.hibernate.ejb.test.callbacks; -import javax.persistence.Id; -import javax.persistence.GeneratedValue; import javax.persistence.Entity; import javax.persistence.EntityListeners; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Television.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Television.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/Television.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -7,8 +7,8 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.OneToOne; +import javax.persistence.PrePersist; import javax.persistence.PreUpdate; -import javax.persistence.PrePersist; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/VideoSystem.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/VideoSystem.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/callbacks/VideoSystem.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -4,8 +4,8 @@ import javax.persistence.EntityListeners; import javax.persistence.ExcludeSuperclassListeners; import javax.persistence.MappedSuperclass; +import javax.persistence.PrePersist; import javax.persistence.PreUpdate; -import javax.persistence.PrePersist; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Conference.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Conference.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Conference.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -3,6 +3,7 @@ import java.io.Serializable; import java.util.Date; + import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.DiscriminatorColumn; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -7,6 +7,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutput; import java.io.ObjectOutputStream; + import javax.persistence.EntityManager; import javax.persistence.EntityTransaction; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocument.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocument.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocument.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,6 +2,7 @@ package org.hibernate.ejb.test.cascade; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocumentInfo.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocumentInfo.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocumentInfo.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -6,6 +6,7 @@ import java.util.Date; import java.util.Iterator; import java.util.List; + import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/FetchTest.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/FetchTest.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/FetchTest.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.Date; + import javax.persistence.EntityManager; import javax.persistence.EntityTransaction; import javax.persistence.Query; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Soldier.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Soldier.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Soldier.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,6 +2,7 @@ package org.hibernate.ejb.test.cascade; import java.io.Serializable; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.FetchType; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Soldier2.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Soldier2.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Soldier2.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -1,6 +1,7 @@ package org.hibernate.ejb.test.cascade; import java.io.Serializable; + import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Troop.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Troop.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Troop.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.FetchType; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Troop2.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Troop2.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/Troop2.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -1,9 +1,10 @@ package org.hibernate.ejb.test.cascade; import java.io.Serializable; + import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,9 +2,11 @@ package org.hibernate.ejb.test.connection; import java.io.File; + import javax.persistence.EntityManagerFactory; import junit.framework.TestCase; + import org.hibernate.ejb.HibernatePersistence; /** Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/FakeDataSource.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/FakeDataSource.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/FakeDataSource.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -4,6 +4,7 @@ import java.io.PrintWriter; import java.sql.Connection; import java.sql.SQLException; + import javax.sql.DataSource; /** Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; + import javax.persistence.spi.ClassTransformer; import javax.persistence.spi.PersistenceUnitInfo; import javax.persistence.spi.PersistenceUnitTransactionType; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,12 +2,8 @@ package org.hibernate.ejb.test.ejb3configuration; import java.io.Serializable; -import java.util.Iterator; import org.hibernate.CallbackException; -import org.hibernate.EntityMode; -import org.hibernate.Interceptor; -import org.hibernate.Transaction; import org.hibernate.EmptyInterceptor; import org.hibernate.type.Type; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -3,8 +3,8 @@ import java.io.Serializable; +import org.hibernate.CallbackException; import org.hibernate.type.Type; -import org.hibernate.CallbackException; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -6,6 +6,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; + import javax.persistence.Persistence; import org.hibernate.cfg.Environment; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Colony.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Colony.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Colony.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,8 +2,8 @@ package org.hibernate.ejb.test.emops; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Competition.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Competition.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Competition.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -1,17 +1,17 @@ //$Id: $ package org.hibernate.ejb.test.emops; -import java.util.Collection; import java.util.ArrayList; import java.util.List; + +import javax.persistence.CascadeType; import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; import javax.persistence.ManyToMany; -import javax.persistence.CascadeType; -import javax.persistence.FetchType; -import javax.persistence.JoinTable; -import javax.persistence.JoinColumn; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Competitor.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Competitor.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Competitor.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,8 +2,8 @@ package org.hibernate.ejb.test.emops; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Dress.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Dress.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Dress.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -1,8 +1,8 @@ //$Id: $ package org.hibernate.ejb.test.emops; +import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.Entity; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Empire.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Empire.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Empire.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -3,11 +3,12 @@ import java.util.HashSet; import java.util.Set; + +import javax.persistence.CascadeType; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; import javax.persistence.OneToMany; -import javax.persistence.CascadeType; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/FlushModeTest.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/FlushModeTest.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/FlushModeTest.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -1,8 +1,9 @@ //$Id: $ package org.hibernate.ejb.test.emops; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; + import javax.persistence.EntityManager; import org.hibernate.ejb.test.TestCase; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -1,14 +1,14 @@ //$Id: $ package org.hibernate.ejb.test.emops; +import java.util.ArrayList; import java.util.Collection; +import java.util.HashSet; import java.util.List; -import java.util.ArrayList; import java.util.Set; -import java.util.HashSet; +import javax.persistence.EntityManager; import javax.persistence.Query; -import javax.persistence.EntityManager; import org.hibernate.ejb.test.TestCase; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/MergeTest.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/MergeTest.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/MergeTest.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -1,8 +1,9 @@ //$Id: $ package org.hibernate.ejb.test.emops; +import java.util.ArrayList; import java.util.List; -import java.util.ArrayList; + import javax.persistence.EntityManager; import org.hibernate.ejb.test.TestCase; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Music.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Music.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Music.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -1,10 +1,10 @@ //$Id: $ package org.hibernate.ejb.test.emops; -import javax.persistence.Version; -import javax.persistence.Id; import javax.persistence.Entity; import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Version; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Race.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Race.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/Race.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -1,14 +1,15 @@ //$Id: $ package org.hibernate.ejb.test.emops; +import java.util.ArrayList; import java.util.List; -import java.util.ArrayList; + +import javax.persistence.CascadeType; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; -import javax.persistence.Entity; import javax.persistence.OneToMany; -import javax.persistence.CascadeType; -import javax.persistence.FetchType; import org.hibernate.annotations.IndexColumn; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/RemoveTest.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/RemoveTest.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/RemoveTest.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,6 +2,7 @@ package org.hibernate.ejb.test.emops; import java.util.Map; + import javax.persistence.EntityManager; import javax.persistence.OptimisticLockException; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/A.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/A.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/A.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -3,6 +3,7 @@ import java.util.HashSet; import java.util.Set; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.FetchType; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/B1.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/B1.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/B1.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -3,6 +3,7 @@ import java.util.HashSet; import java.util.Set; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.FetchType; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/B2.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/B2.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/B2.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -3,6 +3,7 @@ import java.util.HashSet; import java.util.Set; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.FetchType; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -3,8 +3,8 @@ import javax.persistence.EntityManager; +import org.hibernate.Session; import org.hibernate.ejb.test.TestCase; -import org.hibernate.Session; import org.hibernate.stat.Statistics; /** Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/exception/Music.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/exception/Music.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/exception/Music.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,9 +2,10 @@ package org.hibernate.ejb.test.exception; import java.io.Serializable; + import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; import javax.persistence.Version; /** Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/inheritance/Fruit.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/inheritance/Fruit.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/inheritance/Fruit.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,10 +2,10 @@ package org.hibernate.ejb.test.inheritance; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; -import javax.persistence.Id; -import javax.persistence.GeneratedValue; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lob/BlobTest.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lob/BlobTest.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lob/BlobTest.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -7,6 +7,7 @@ import java.sql.Blob; import java.util.HashMap; import java.util.Map; + import javax.persistence.EntityManager; import org.hibernate.Hibernate; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lob/ImageReader.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lob/ImageReader.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lob/ImageReader.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -4,6 +4,7 @@ import java.io.Serializable; import java.sql.Blob; import java.sql.Clob; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lock/UnversionedLock.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lock/UnversionedLock.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lock/UnversionedLock.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -1,9 +1,9 @@ //$Id: $ package org.hibernate.ejb.test.lock; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; -import javax.persistence.Entity; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/Animal.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/Animal.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/Animal.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,8 +2,8 @@ package org.hibernate.ejb.test.ops; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/GetLoadTest.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/GetLoadTest.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/GetLoadTest.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -3,6 +3,7 @@ import junit.framework.Test; import junit.framework.TestSuite; + import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/MergeTest.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/MergeTest.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/MergeTest.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -3,6 +3,7 @@ import junit.framework.Test; import junit.framework.TestSuite; + import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -6,6 +6,7 @@ import junit.framework.Test; import junit.framework.TestSuite; + import org.hibernate.PersistentObjectException; import org.hibernate.Session; import org.hibernate.Transaction; Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Money.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Money.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Money.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,8 +2,8 @@ package org.hibernate.ejb.test.pack.defaultpar; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -3,8 +3,8 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -3,8 +3,8 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/war/Money.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/war/Money.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/war/Money.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,8 +2,8 @@ package org.hibernate.ejb.test.pack.war; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -6,16 +6,16 @@ import javax.persistence.EntityManager; import javax.persistence.LockModeType; +import javax.persistence.OptimisticLockException; +import javax.persistence.PersistenceException; import javax.persistence.RollbackException; import javax.persistence.TransactionRequiredException; -import javax.persistence.PersistenceException; -import javax.persistence.OptimisticLockException; +import org.hibernate.Session; import org.hibernate.cfg.Environment; import org.hibernate.ejb.HibernateEntityManagerFactory; import org.hibernate.ejb.test.TestCase; import org.hibernate.stat.Statistics; -import org.hibernate.Session; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/Article.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/Article.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/Article.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -1,14 +1,14 @@ //$Id: $ package org.hibernate.ejb.test.xml; +import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; import javax.persistence.Table; -import javax.persistence.GeneratedValue; -import javax.persistence.CascadeType; -import javax.persistence.ManyToOne; -import javax.persistence.JoinColumn; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/CounterListener.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/CounterListener.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/CounterListener.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -2,8 +2,8 @@ package org.hibernate.ejb.test.xml; import javax.persistence.PrePersist; +import javax.persistence.PreRemove; import javax.persistence.PreUpdate; -import javax.persistence.PreRemove; /** * @author Emmanuel Bernard Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/sequences/Article.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/sequences/Article.java 2010-03-23 21:14:04 UTC (rev 19092) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/sequences/Article.java 2010-03-23 21:24:49 UTC (rev 19093) @@ -1,14 +1,14 @@ //$Id: $ package org.hibernate.ejb.test.xml.sequences; +import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; import javax.persistence.Table; -import javax.persistence.GeneratedValue; -import javax.persistence.CascadeType; -import javax.persistence.ManyToOne; -import javax.persistence.JoinColumn; /** * @author Emmanuel Bernard