From 89298608b0ba18049272fc0f2784fb3d251da905 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Sat, 9 Oct 2010 13:02:49 -0500 Subject: [PATCH] HHH-5616 - Switch to Gradle for builds .. em --- build.gradle | 14 +- entitymanager/.cvsignore | 4 - entitymanager/pom.xml | 208 ------------------ .../overridenpar/overridenpar.properties | 5 - .../src/test/resources/hibernate.properties | 33 --- .../src/test/resources/log4j.properties | 39 ---- .../build.xml | 0 .../hibernate-entitymanager.gradle | 58 +++++ .../src/main/docbook/en/master.xml | 0 .../main/docbook/en/modules/architecture.xml | 0 .../src/main/docbook/en/modules/batch.xml | 0 .../main/docbook/en/modules/configuration.xml | 0 .../docbook/en/modules/entitymanagerapi.xml | 0 .../src/main/docbook/en/modules/listeners.xml | 0 .../src/main/docbook/en/modules/metamodel.xml | 0 .../docbook/en/modules/query_criteria.xml | 0 .../main/docbook/en/modules/query_ejbql.xml | 0 .../main/docbook/en/modules/query_native.xml | 0 .../main/docbook/en/modules/transactions.xml | 0 .../ejb/AbstractEntityManagerImpl.java | 0 .../org/hibernate/ejb/AbstractQueryImpl.java | 0 .../org/hibernate/ejb/AvailableSettings.java | 0 .../ejb/CurrentEntityManagerImpl.java | 0 .../org/hibernate/ejb/Ejb3Configuration.java | 0 .../ejb/Ejb3ConfigurationObjectFactory.java | 0 .../ejb/EntityManagerFactoryImpl.java | 0 .../org/hibernate/ejb/EntityManagerImpl.java | 0 .../ejb/EventListenerConfigurator.java | 0 .../hibernate/ejb/HibernateEntityManager.java | 0 .../ejb/HibernateEntityManagerFactory.java | 0 .../HibernateEntityManagerImplementor.java | 0 .../hibernate/ejb/HibernatePersistence.java | 0 .../org/hibernate/ejb/HibernateQuery.java | 0 .../ejb/InjectionSettingsFactory.java | 0 .../java/org/hibernate/ejb/QueryHints.java | 0 .../java/org/hibernate/ejb/QueryImpl.java | 0 .../org/hibernate/ejb/TransactionImpl.java | 0 .../main/java/org/hibernate/ejb/Version.java | 0 .../InjectedDataSourceConnectionProvider.java | 0 .../hibernate/ejb/criteria/AbstractNode.java | 0 .../ejb/criteria/BasicPathUsageException.java | 0 .../criteria/CollectionJoinImplementor.java | 0 .../ejb/criteria/CriteriaBuilderImpl.java | 0 .../ejb/criteria/CriteriaQueryCompiler.java | 0 .../ejb/criteria/CriteriaQueryImpl.java | 0 .../ejb/criteria/CriteriaSubqueryImpl.java | 0 .../ejb/criteria/ExpressionImplementor.java | 0 .../ejb/criteria/FromImplementor.java | 0 .../criteria/IllegalDereferenceException.java | 0 .../ejb/criteria/JoinImplementor.java | 0 .../ejb/criteria/ListJoinImplementor.java | 0 .../ejb/criteria/MapJoinImplementor.java | 0 .../org/hibernate/ejb/criteria/OrderImpl.java | 0 .../ejb/criteria/ParameterContainer.java | 0 .../ejb/criteria/ParameterRegistry.java | 0 .../ejb/criteria/PathImplementor.java | 0 .../hibernate/ejb/criteria/PathSource.java | 0 .../ejb/criteria/QueryStructure.java | 0 .../hibernate/ejb/criteria/Renderable.java | 0 .../ejb/criteria/SelectionImplementor.java | 0 .../ejb/criteria/SetJoinImplementor.java | 0 .../ejb/criteria/TupleElementImplementor.java | 0 .../ejb/criteria/ValueHandlerFactory.java | 0 .../expression/AbstractTupleElement.java | 0 .../expression/BinaryArithmeticOperation.java | 0 .../expression/BinaryOperatorExpression.java | 0 .../expression/CoalesceExpression.java | 0 .../expression/CompoundSelectionImpl.java | 0 .../criteria/expression/ConcatExpression.java | 0 .../expression/EntityTypeExpression.java | 0 .../criteria/expression/ExpressionImpl.java | 0 .../expression/ListIndexExpression.java | 0 .../expression/LiteralExpression.java | 0 .../expression/MapEntryExpression.java | 0 .../expression/NullLiteralExpression.java | 0 .../criteria/expression/NullifExpression.java | 0 .../expression/ParameterExpressionImpl.java | 0 .../expression/PathTypeExpression.java | 0 .../expression/SearchedCaseExpression.java | 0 .../criteria/expression/SelectionImpl.java | 0 .../expression/SimpleCaseExpression.java | 0 .../SizeOfCollectionExpression.java | 0 .../SubqueryComparisonModifierExpression.java | 0 .../expression/UnaryArithmeticOperation.java | 0 .../expression/UnaryOperatorExpression.java | 0 .../expression/function/AbsFunction.java | 0 .../function/AggregationFunction.java | 0 .../function/BasicFunctionExpression.java | 0 .../expression/function/CastFunction.java | 0 .../function/CurrentDateFunction.java | 0 .../function/CurrentTimeFunction.java | 0 .../function/CurrentTimestampFunction.java | 0 .../function/FunctionExpression.java | 0 .../expression/function/LengthFunction.java | 0 .../expression/function/LocateFunction.java | 0 .../expression/function/LowerFunction.java | 0 .../ParameterizedFunctionExpression.java | 0 .../expression/function/SqrtFunction.java | 0 .../function/SubstringFunction.java | 0 .../expression/function/TrimFunction.java | 0 .../expression/function/UpperFunction.java | 0 .../ejb/criteria/path/AbstractFromImpl.java | 0 .../ejb/criteria/path/AbstractJoinImpl.java | 0 .../ejb/criteria/path/AbstractPathImpl.java | 0 .../path/CollectionAttributeJoin.java | 0 .../ejb/criteria/path/ListAttributeJoin.java | 0 .../ejb/criteria/path/MapAttributeJoin.java | 0 .../ejb/criteria/path/MapKeyHelpers.java | 0 .../path/PluralAttributeJoinSupport.java | 0 .../criteria/path/PluralAttributePath.java | 0 .../hibernate/ejb/criteria/path/RootImpl.java | 0 .../ejb/criteria/path/SetAttributeJoin.java | 0 .../criteria/path/SingularAttributeJoin.java | 0 .../criteria/path/SingularAttributePath.java | 0 .../predicate/AbstractPredicateImpl.java | 0 .../predicate/AbstractSimplePredicate.java | 0 .../criteria/predicate/BetweenPredicate.java | 0 .../predicate/BooleanAssertionPredicate.java | 0 .../predicate/BooleanExpressionPredicate.java | 0 .../BooleanStaticAssertionPredicate.java | 0 .../predicate/ComparisonPredicate.java | 0 .../criteria/predicate/CompoundPredicate.java | 0 .../criteria/predicate/ExistsPredicate.java | 0 .../predicate/ExplicitTruthValueCheck.java | 0 .../ejb/criteria/predicate/InPredicate.java | 0 .../criteria/predicate/IsEmptyPredicate.java | 0 .../ejb/criteria/predicate/LikePredicate.java | 0 .../criteria/predicate/MemberOfPredicate.java | 0 .../criteria/predicate/NullnessPredicate.java | 0 .../ejb/criteria/predicate/TruthValue.java | 0 .../org/hibernate/ejb/event/BeanCallback.java | 0 .../org/hibernate/ejb/event/Callback.java | 0 .../ejb/event/CallbackHandlerConsumer.java | 0 .../hibernate/ejb/event/CallbackResolver.java | 0 .../ejb/event/EJB3AutoFlushEventListener.java | 0 .../ejb/event/EJB3DeleteEventListener.java | 0 .../event/EJB3FlushEntityEventListener.java | 0 .../ejb/event/EJB3FlushEventListener.java | 0 .../ejb/event/EJB3MergeEventListener.java | 0 .../ejb/event/EJB3PersistEventListener.java | 0 .../EJB3PersistOnFlushEventListener.java | 0 .../event/EJB3PostDeleteEventListener.java | 0 .../event/EJB3PostInsertEventListener.java | 0 .../ejb/event/EJB3PostLoadEventListener.java | 0 .../event/EJB3PostUpdateEventListener.java | 0 .../ejb/event/EJB3SaveEventListener.java | 0 .../event/EJB3SaveOrUpdateEventListener.java | 0 .../ejb/event/EntityCallbackHandler.java | 0 .../hibernate/ejb/event/ListenerCallback.java | 0 .../InterceptFieldClassFileTransformer.java | 0 .../ejb/metamodel/AbstractAttribute.java | 0 .../metamodel/AbstractIdentifiableType.java | 0 .../ejb/metamodel/AbstractManagedType.java | 0 .../hibernate/ejb/metamodel/AbstractType.java | 0 .../ejb/metamodel/AttributeFactory.java | 0 .../ejb/metamodel/AttributeImplementor.java | 0 .../ejb/metamodel/BasicTypeImpl.java | 0 .../ejb/metamodel/EmbeddableTypeImpl.java | 0 .../ejb/metamodel/EntityTypeImpl.java | 0 .../metamodel/MappedSuperclassTypeImpl.java | 0 .../ejb/metamodel/MetadataContext.java | 0 .../ejb/metamodel/MetamodelImpl.java | 0 .../ejb/metamodel/PluralAttributeImpl.java | 0 .../ejb/metamodel/SingularAttributeImpl.java | 0 .../ejb/packaging/AbstractJarVisitor.java | 0 .../hibernate/ejb/packaging/ClassFilter.java | 0 .../org/hibernate/ejb/packaging/Entry.java | 0 .../ejb/packaging/ExplodedJarVisitor.java | 0 .../hibernate/ejb/packaging/FileFilter.java | 0 .../ejb/packaging/FileZippedJarVisitor.java | 0 .../org/hibernate/ejb/packaging/Filter.java | 0 .../InputStreamZippedJarVisitor.java | 0 .../ejb/packaging/JarProtocolVisitor.java | 0 .../hibernate/ejb/packaging/JarVisitor.java | 0 .../ejb/packaging/JarVisitorFactory.java | 0 .../ejb/packaging/JavaElementFilter.java | 0 .../ejb/packaging/NamedInputStream.java | 0 .../ejb/packaging/NativeScanner.java | 0 .../ejb/packaging/PackageFilter.java | 0 .../ejb/packaging/PersistenceMetadata.java | 0 .../ejb/packaging/PersistenceXmlLoader.java | 0 .../org/hibernate/ejb/packaging/Scanner.java | 0 .../hibernate/ejb/packaging/XmlHelper.java | 0 .../transaction/JoinableCMTTransaction.java | 0 .../JoinableCMTTransactionFactory.java | 0 .../hibernate/ejb/util/CacheModeHelper.java | 0 .../ejb/util/ConfigurationHelper.java | 0 .../ejb/util/LockModeTypeHelper.java | 0 .../org/hibernate/ejb/util/LogHelper.java | 0 .../org/hibernate/ejb/util/NamingHelper.java | 0 .../ejb/util/PersistenceUtilHelper.java | 0 .../hibernate/engine/EJB3CascadeStyle.java | 0 .../hibernate/engine/EJB3CascadingAction.java | 0 .../src/main/javadoc/jdstyle.css | 0 .../src/main/javadoc/package.html | 0 .../javax.persistence.spi.PersistenceProvider | 0 .../org/hibernate/ejb/persistence_1_0.xsd | 0 .../org/hibernate/ejb/persistence_2_0.xsd | 0 .../cfgxmlpar/META-INF/persistence.xml | 0 .../ejb/test/pack/cfgxmlpar/hibernate.cfg.xml | 0 .../test/bundles/defaultpar/META-INF/orm.xml | 0 .../defaultpar/META-INF/persistence.xml | 0 .../ejb/test/pack/defaultpar/Mouse.hbm.xml | 0 .../bundles/defaultpar_1_0/META-INF/orm.xml | 0 .../defaultpar_1_0/META-INF/persistence.xml | 0 .../test/pack/defaultpar_1_0/Mouse1.hbm.xml | 0 .../bundles/excludehbmpar/META-INF/orm2.xml | 0 .../excludehbmpar/META-INF/persistence.xml | 0 .../ejb/test/pack/excludehbmpar/Mouse.hbm.xml | 0 .../test/bundles/explicitpar/META-INF/orm.xml | 0 .../explicitpar/META-INF/persistence.xml | 0 .../explodedpar/META-INF/persistence.xml | 0 .../test/pack/explodedpar/Elephant.hbm.xml | 0 .../test/bundles/externaljar/META-INF/orm.xml | 0 .../overridenpar/META-INF/persistence.xml | 0 .../space par/META-INF/persistence.xml | 0 .../war/WEB-INF/classes/META-INF/orm.xml | 0 .../WEB-INF/classes/META-INF/persistence.xml | 0 .../hibernate/ejb/test/pack/war/Mouse.hbm.xml | 0 .../src/test/java/NoPackageEntity.java | 0 .../ejb/criteria/CriteriaCompilingTest.java | 0 .../ejb/criteria/QueryBuilderTest.java | 0 .../criteria/basic/AggregationResultTest.java | 0 .../basic/BasicCriteriaUsageTest.java | 0 .../ejb/criteria/basic/ExpressionsTest.java | 0 .../ejb/criteria/basic/PredicateTest.java | 0 .../hibernate/ejb/criteria/basic/Wall.java | 0 .../ejb/criteria/components/Client.java | 0 .../components/ComponentCriteriaTest.java | 0 .../ejb/criteria/components/Name.java | 0 .../ejb/criteria/paths/ImplicitJoinTest.java | 0 .../subquery/CorrelatedSubqueryTest.java | 0 .../subquery/UncorrelatedSubqueryTest.java | 0 .../ejb/criteria/tuple/TupleCriteriaTest.java | 0 .../AbstractMetamodelSpecificTest.java | 0 .../org/hibernate/ejb/metamodel/Address.java | 0 .../org/hibernate/ejb/metamodel/Alias.java | 0 .../org/hibernate/ejb/metamodel/Country.java | 0 .../hibernate/ejb/metamodel/CreditCard.java | 0 .../org/hibernate/ejb/metamodel/Customer.java | 0 .../ejb/metamodel/EmbeddedTypeTest.java | 0 .../org/hibernate/ejb/metamodel/Info.java | 0 .../org/hibernate/ejb/metamodel/LineItem.java | 0 .../org/hibernate/ejb/metamodel/Order.java | 0 .../org/hibernate/ejb/metamodel/Phone.java | 0 .../org/hibernate/ejb/metamodel/Product.java | 0 .../hibernate/ejb/metamodel/ShelfLife.java | 0 .../org/hibernate/ejb/metamodel/Spouse.java | 0 .../test/java/org/hibernate/ejb/test/Cat.java | 0 .../org/hibernate/ejb/test/Distributor.java | 0 .../hibernate/ejb/test/EntityManagerTest.java | 0 .../java/org/hibernate/ejb/test/Item.java | 0 .../java/org/hibernate/ejb/test/Kitten.java | 0 .../ejb/test/LastUpdateListener.java | 0 .../hibernate/ejb/test/MyNamingStrategy.java | 0 .../org/hibernate/ejb/test/NoOpListener.java | 0 .../java/org/hibernate/ejb/test/TestCase.java | 0 .../java/org/hibernate/ejb/test/Wallet.java | 0 .../ejb/test/association/AssociationTest.java | 0 .../ejb/test/association/Incident.java | 0 .../ejb/test/association/IncidentStatus.java | 0 .../ejb/test/association/Kitchen.java | 0 .../hibernate/ejb/test/association/Oven.java | 0 .../beanvalidation/BeanValidationTest.java | 0 .../ejb/test/beanvalidation/CupHolder.java | 0 .../annotation/ConfigurationTest.java | 0 .../annotation/ExplicitlyCacheableEntity.java | 0 .../ExplicitlyNonCacheableEntity.java | 0 .../NoCacheableAnnotationEntity.java | 0 .../cachemodes/SharedCacheModesTest.java | 0 .../cacheable/cachemodes/SimpleEntity.java | 0 .../test/callbacks/CallbackAndDirtyTest.java | 0 .../ejb/test/callbacks/CallbacksTest.java | 0 .../test/callbacks/CommunicationSystem.java | 0 .../ejb/test/callbacks/CountryChecker.java | 0 .../callbacks/CountryNameCheckerListener.java | 0 .../ejb/test/callbacks/Customer.java | 0 .../ejb/test/callbacks/Employee.java | 0 .../ejb/test/callbacks/ExceptionListener.java | 0 .../ejb/test/callbacks/FirstOneListener.java | 0 .../ejb/test/callbacks/IncreaseListener.java | 0 .../hibernate/ejb/test/callbacks/Person.java | 0 .../hibernate/ejb/test/callbacks/Plant.java | 0 .../ejb/test/callbacks/RemoteControl.java | 0 .../hibernate/ejb/test/callbacks/Rythm.java | 0 .../ejb/test/callbacks/Television.java | 0 .../ejb/test/callbacks/Translation.java | 0 .../ejb/test/callbacks/VideoSystem.java | 0 .../hibernate/ejb/test/cascade/Author.java | 0 .../ejb/test/cascade/CascadeTest.java | 0 .../ejb/test/cascade/Conference.java | 0 .../ejb/test/cascade/DeleteOrphanTest.java | 0 .../test/cascade/DetachAndContainsTest.java | 0 .../ejb/test/cascade/ExtractionDocument.java | 0 .../test/cascade/ExtractionDocumentInfo.java | 0 .../hibernate/ejb/test/cascade/FetchTest.java | 0 .../ejb/test/cascade/FetchTest2.java | 0 .../hibernate/ejb/test/cascade/Grandson.java | 0 .../hibernate/ejb/test/cascade/Parent.java | 0 .../hibernate/ejb/test/cascade/Soldier.java | 0 .../hibernate/ejb/test/cascade/Soldier2.java | 0 .../org/hibernate/ejb/test/cascade/Son.java | 0 .../org/hibernate/ejb/test/cascade/Song.java | 0 .../hibernate/ejb/test/cascade/Student.java | 0 .../hibernate/ejb/test/cascade/Teacher.java | 0 .../org/hibernate/ejb/test/cascade/Troop.java | 0 .../hibernate/ejb/test/cascade/Troop2.java | 0 .../connection/DataSourceInjectionTest.java | 0 .../ejb/test/connection/FakeDataSource.java | 0 .../connection/FakeDataSourceException.java | 0 .../connection/PersistenceUnitInfoImpl.java | 0 .../ConfigurationObjectSettingTest.java | 0 .../EntityManagerSerializationTest.java | 0 .../ExceptionInterceptor.java | 0 .../ejb3configuration/InterceptorTest.java | 0 .../LocalExceptionInterceptor.java | 0 .../PersistenceUnitInfoAdapter.java | 0 .../ProgrammaticConfTest.java | 0 .../ejb/test/ejb3configuration/TestCase.java | 0 .../org/hibernate/ejb/test/emops/Cat.java | 0 .../org/hibernate/ejb/test/emops/Colony.java | 0 .../hibernate/ejb/test/emops/Competition.java | 0 .../hibernate/ejb/test/emops/Competitor.java | 0 .../hibernate/ejb/test/emops/Decorate.java | 0 .../org/hibernate/ejb/test/emops/Dog.java | 0 .../org/hibernate/ejb/test/emops/Dress.java | 0 .../org/hibernate/ejb/test/emops/Empire.java | 0 .../ejb/test/emops/FlushModeTest.java | 0 .../hibernate/ejb/test/emops/FlushTest.java | 0 .../ejb/test/emops/GetReferenceTest.java | 0 .../org/hibernate/ejb/test/emops/Mail.java | 0 .../hibernate/ejb/test/emops/MergeTest.java | 0 .../org/hibernate/ejb/test/emops/Music.java | 0 .../org/hibernate/ejb/test/emops/Pet.java | 0 .../org/hibernate/ejb/test/emops/Race.java | 0 .../hibernate/ejb/test/emops/RefreshTest.java | 0 .../hibernate/ejb/test/emops/RemoveTest.java | 0 .../hibernate/ejb/test/emops/cascade/A.java | 0 .../hibernate/ejb/test/emops/cascade/B1.java | 0 .../hibernate/ejb/test/emops/cascade/B2.java | 0 .../hibernate/ejb/test/emops/cascade/B3.java | 0 .../hibernate/ejb/test/emops/cascade/B4.java | 0 .../hibernate/ejb/test/emops/cascade/C1.java | 0 .../hibernate/ejb/test/emops/cascade/C2.java | 0 .../emops/cascade/CascadePersistTest.java | 0 .../ejb/test/exception/ExceptionTest.java | 0 .../ejb/test/exception/Instrument.java | 0 .../hibernate/ejb/test/exception/Music.java | 0 .../ejb/test/exception/Musician.java | 0 .../hibernate/ejb/test/inheritance/Fruit.java | 0 .../ejb/test/inheritance/InheritanceTest.java | 0 .../ejb/test/inheritance/Strawberry.java | 0 .../instrument/InstrumentedClassLoader.java | 0 ...nterceptFieldClassFileTransformerTest.java | 0 .../hibernate/ejb/test/instrument/Simple.java | 0 .../ejb/test/jee/OrmVersionTest.java | 0 .../org/hibernate/ejb/test/lob/BlobTest.java | 0 .../hibernate/ejb/test/lob/ImageReader.java | 0 .../org/hibernate/ejb/test/lock/Lock.java | 0 .../org/hibernate/ejb/test/lock/LockTest.java | 7 +- .../org/hibernate/ejb/test/lock/Lockable.java | 0 .../ejb/test/lock/QueryLockingTest.java | 0 .../ejb/test/lock/UnversionedLock.java | 0 .../org/hibernate/ejb/test/mapping/Phone.java | 0 .../ejb/test/mapping/QuotingTest.java | 0 .../hibernate/ejb/test/metadata/Address.java | 0 .../hibernate/ejb/test/metadata/Animal.java | 0 .../hibernate/ejb/test/metadata/Being.java | 0 .../org/hibernate/ejb/test/metadata/Cat.java | 0 .../hibernate/ejb/test/metadata/Cattish.java | 0 .../hibernate/ejb/test/metadata/Child.java | 0 .../ejb/test/metadata/DeskWithRawType.java | 0 .../org/hibernate/ejb/test/metadata/Dog.java | 0 .../test/metadata/EmployeeWithRawType.java | 0 .../hibernate/ejb/test/metadata/Feline.java | 0 .../hibernate/ejb/test/metadata/Flower.java | 0 .../hibernate/ejb/test/metadata/FoodItem.java | 0 .../hibernate/ejb/test/metadata/Fridge.java | 0 .../hibernate/ejb/test/metadata/Garden.java | 0 .../hibernate/ejb/test/metadata/House.java | 0 .../test/metadata/JoinedManyToOneOwner.java | 0 .../ejb/test/metadata/MetadataTest.java | 0 .../hibernate/ejb/test/metadata/Parent.java | 0 .../hibernate/ejb/test/metadata/Person.java | 0 .../org/hibernate/ejb/test/metadata/Room.java | 0 .../ejb/test/metadata/SecondMetadataTest.java | 0 .../test/metadata/SimpleMedicalHistory.java | 0 .../ejb/test/metadata/SimplePerson.java | 0 .../ejb/test/metadata/StaticMetadataTest.java | 0 .../hibernate/ejb/test/metadata/SubThing.java | 0 .../hibernate/ejb/test/metadata/Thing.java | 0 .../test/metadata/WithGenericCollection.java | 0 .../org/hibernate/ejb/test/ops/Animal.java | 0 .../org/hibernate/ejb/test/ops/Employee.java | 0 .../org/hibernate/ejb/test/ops/Employer.java | 0 .../org/hibernate/ejb/test/ops/FindTest.java | 0 .../hibernate/ejb/test/ops/GetLoadTest.java | 0 .../org/hibernate/ejb/test/ops/Mammal.java | 0 .../hibernate/ejb/test/ops/MergeNewTest.java | 0 .../org/hibernate/ejb/test/ops/MergeTest.java | 0 .../java/org/hibernate/ejb/test/ops/Node.java | 0 .../hibernate/ejb/test/ops/NumberedNode.java | 0 .../hibernate/ejb/test/ops/PersistTest.java | 0 .../org/hibernate/ejb/test/ops/Reptile.java | 0 .../org/hibernate/ejb/test/ops/Workload.java | 0 .../ejb/test/pack/cfgxmlpar/Morito.java | 0 .../pack/defaultpar/ApplicationServer.java | 0 .../pack/defaultpar/IncrementListener.java | 0 .../ejb/test/pack/defaultpar/Lighter.java | 0 .../ejb/test/pack/defaultpar/Money.java | 0 .../ejb/test/pack/defaultpar/Mouse.java | 0 .../defaultpar/OtherIncrementListener.java | 0 .../ejb/test/pack/defaultpar/Version.java | 0 .../test/pack/defaultpar/package-info.java | 0 .../defaultpar_1_0/ApplicationServer1.java | 0 .../defaultpar_1_0/IncrementListener1.java | 0 .../test/pack/defaultpar_1_0/Lighter1.java | 0 .../ejb/test/pack/defaultpar_1_0/Money1.java | 0 .../ejb/test/pack/defaultpar_1_0/Mouse1.java | 0 .../OtherIncrementListener1.java | 0 .../test/pack/defaultpar_1_0/Version1.java | 0 .../pack/defaultpar_1_0/package-info.java | 0 .../test/pack/excludehbmpar/Caipirinha.java | 0 .../ejb/test/pack/explicitpar/Washer.java | 0 .../ejb/test/pack/explodedpar/Carpet.java | 0 .../ejb/test/pack/explodedpar/Elephant.java | 0 .../test/pack/explodedpar/package-info.java | 0 .../ejb/test/pack/externaljar/Scooter.java | 0 .../ejb/test/pack/overridenpar/Bug.java | 0 .../hibernate/ejb/test/pack/spacepar/Bug.java | 0 .../ejb/test/pack/various/Airplane.java | 0 .../hibernate/ejb/test/pack/various/Seat.java | 0 .../ejb/test/pack/war/ApplicationServer.java | 0 .../ejb/test/pack/war/IncrementListener.java | 0 .../hibernate/ejb/test/pack/war/Lighter.java | 0 .../hibernate/ejb/test/pack/war/Money.java | 0 .../hibernate/ejb/test/pack/war/Mouse.java | 0 .../test/pack/war/OtherIncrementListener.java | 0 .../hibernate/ejb/test/pack/war/Version.java | 0 .../ejb/test/pack/war/package-info.java | 0 .../ejb/test/packaging/CustomScanner.java | 0 .../ejb/test/packaging/JarVisitorTest.java | 0 .../packaging/PackagedEntityManagerTest.java | 0 .../ejb/test/packaging/PackagingTestCase.java | 0 .../hibernate/ejb/test/packaging/Pasta.java | 0 .../ejb/test/packaging/ScannerTest.java | 0 .../ejb/test/query/ComponentJoinsTest.java | 0 .../hibernate/ejb/test/query/QueryTest.java | 0 .../hibernate/ejb/test/transaction/Book.java | 0 .../transaction/FlushAndTransactionTest.java | 0 .../org/hibernate/ejb/test/util/Author.java | 0 .../org/hibernate/ejb/test/util/Book.java | 0 .../ejb/test/util/CopyrightableContent.java | 0 .../ejb/test/util/GetIdentifierTest.java | 0 .../hibernate/ejb/test/util/IsLoadedTest.java | 0 .../test/util/PersistenceUtilHelperTest.java | 0 .../org/hibernate/ejb/test/util/Sickness.java | 0 .../org/hibernate/ejb/test/util/Umbrella.java | 0 .../org/hibernate/ejb/test/xml/Address.java | 0 .../org/hibernate/ejb/test/xml/Article.java | 0 .../ejb/test/xml/CounterListener.java | 0 .../org/hibernate/ejb/test/xml/Employee.java | 0 .../org/hibernate/ejb/test/xml/Light.java | 0 .../org/hibernate/ejb/test/xml/Lighter.java | 0 .../test/xml/XmlAttributeOverrideTest.java | 0 .../org/hibernate/ejb/test/xml/XmlTest.java | 0 .../ejb/test/xml/sequences/Address.java | 0 .../ejb/test/xml/sequences/Article.java | 0 .../ejb/test/xml/sequences/Employee.java | 0 .../ejb/test/xml/sequences/Light.java | 0 .../ejb/test/xml/sequences/Lighter.java | 0 .../sequences/XmlAttributeOverrideTest.java | 0 .../ejb/test/xml/sequences/XmlTest.java | 0 .../test/ejb3configuration/hibernate.cfg.xml | 0 .../org/hibernate/ejb/test/hibernate.cfg.xml | 0 .../hibernate/ejb/test/jee/invalid-orm-1.xml | 0 .../hibernate/ejb/test/jee/valid-orm-1.xml | 0 .../hibernate/ejb/test/jee/valid-orm-2.xml | 0 .../org/hibernate/ejb/test/mapping/orm.xml | 0 .../hibernate/ejb/test/ops/Employer.hbm.xml | 0 .../org/hibernate/ejb/test/ops/Node.hbm.xml | 0 .../org/hibernate/ejb/test/xml/orm.xml | 0 .../org/hibernate/ejb/test/xml/orm2.xml | 0 .../org/hibernate/ejb/test/xml/orm3.xml | 0 .../hibernate/ejb/test/xml/sequences/orm.xml | 0 .../hibernate/ejb/test/xml/sequences/orm2.xml | 0 .../hibernate/ejb/test/xml/sequences/orm3.xml | 0 settings.gradle | 1 + 488 files changed, 70 insertions(+), 299 deletions(-) delete mode 100644 entitymanager/.cvsignore delete mode 100644 entitymanager/pom.xml delete mode 100644 entitymanager/src/test/bundles/overridenpar/overridenpar.properties delete mode 100644 entitymanager/src/test/resources/hibernate.properties delete mode 100755 entitymanager/src/test/resources/log4j.properties rename {entitymanager => hibernate-entitymanager}/build.xml (100%) create mode 100644 hibernate-entitymanager/hibernate-entitymanager.gradle rename {entitymanager => hibernate-entitymanager}/src/main/docbook/en/master.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/main/docbook/en/modules/architecture.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/main/docbook/en/modules/batch.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/main/docbook/en/modules/configuration.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/main/docbook/en/modules/entitymanagerapi.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/main/docbook/en/modules/listeners.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/main/docbook/en/modules/metamodel.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/main/docbook/en/modules/query_criteria.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/main/docbook/en/modules/query_ejbql.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/main/docbook/en/modules/query_native.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/main/docbook/en/modules/transactions.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/AbstractQueryImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/AvailableSettings.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/CurrentEntityManagerImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/Ejb3Configuration.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/EntityManagerImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/EventListenerConfigurator.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/HibernateEntityManager.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/HibernateEntityManagerFactory.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/HibernatePersistence.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/HibernateQuery.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/InjectionSettingsFactory.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/QueryHints.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/QueryImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/TransactionImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/Version.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/AbstractNode.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/BasicPathUsageException.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/CollectionJoinImplementor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/CriteriaBuilderImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryCompiler.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/CriteriaSubqueryImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/ExpressionImplementor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/FromImplementor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/IllegalDereferenceException.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/JoinImplementor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/ListJoinImplementor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/MapJoinImplementor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/OrderImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/ParameterContainer.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/ParameterRegistry.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/PathImplementor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/PathSource.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/QueryStructure.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/Renderable.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/SelectionImplementor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/SetJoinImplementor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/TupleElementImplementor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/ValueHandlerFactory.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/AbstractTupleElement.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/BinaryArithmeticOperation.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/BinaryOperatorExpression.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/CoalesceExpression.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/CompoundSelectionImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/ConcatExpression.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/EntityTypeExpression.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/ExpressionImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/ListIndexExpression.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/LiteralExpression.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/MapEntryExpression.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/NullLiteralExpression.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/NullifExpression.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/ParameterExpressionImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/PathTypeExpression.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/SearchedCaseExpression.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/SelectionImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/SimpleCaseExpression.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/SizeOfCollectionExpression.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/SubqueryComparisonModifierExpression.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/UnaryArithmeticOperation.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/UnaryOperatorExpression.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/function/AbsFunction.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/function/AggregationFunction.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/function/BasicFunctionExpression.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/function/CastFunction.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentDateFunction.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimeFunction.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimestampFunction.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/function/FunctionExpression.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/function/LengthFunction.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/function/LocateFunction.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/function/LowerFunction.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/function/ParameterizedFunctionExpression.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/function/SqrtFunction.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/function/SubstringFunction.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/function/TrimFunction.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/expression/function/UpperFunction.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/path/AbstractFromImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/path/AbstractJoinImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/path/AbstractPathImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/path/CollectionAttributeJoin.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/path/ListAttributeJoin.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/path/MapAttributeJoin.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/path/MapKeyHelpers.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/path/PluralAttributeJoinSupport.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/path/PluralAttributePath.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/path/RootImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/path/SetAttributeJoin.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/path/SingularAttributeJoin.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/path/SingularAttributePath.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractPredicateImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractSimplePredicate.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/predicate/BetweenPredicate.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanAssertionPredicate.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanExpressionPredicate.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanStaticAssertionPredicate.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/predicate/ComparisonPredicate.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/predicate/CompoundPredicate.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/predicate/ExistsPredicate.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/predicate/ExplicitTruthValueCheck.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/predicate/InPredicate.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/predicate/IsEmptyPredicate.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/predicate/LikePredicate.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/predicate/MemberOfPredicate.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/predicate/NullnessPredicate.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/criteria/predicate/TruthValue.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/event/BeanCallback.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/event/Callback.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/event/CallbackHandlerConsumer.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/event/CallbackResolver.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/event/EJB3AutoFlushEventListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/event/EJB3FlushEntityEventListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/event/EJB3FlushEventListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/event/EJB3MergeEventListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/event/EJB3PersistEventListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/event/EJB3PersistOnFlushEventListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/event/EJB3PostDeleteEventListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/event/EJB3PostInsertEventListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/event/EJB3PostLoadEventListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/event/EJB3PostUpdateEventListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/event/EJB3SaveEventListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/event/ListenerCallback.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/instrument/InterceptFieldClassFileTransformer.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/metamodel/AbstractAttribute.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/metamodel/AbstractIdentifiableType.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/metamodel/AbstractManagedType.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/metamodel/AbstractType.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/metamodel/AttributeFactory.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/metamodel/AttributeImplementor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/metamodel/BasicTypeImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/metamodel/EmbeddableTypeImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/metamodel/EntityTypeImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/metamodel/MappedSuperclassTypeImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/metamodel/MetadataContext.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/metamodel/MetamodelImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/metamodel/PluralAttributeImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/metamodel/SingularAttributeImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/packaging/ClassFilter.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/packaging/Entry.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/packaging/FileFilter.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/packaging/Filter.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/packaging/InputStreamZippedJarVisitor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/packaging/JarProtocolVisitor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/packaging/JarVisitor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/packaging/JarVisitorFactory.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/packaging/JavaElementFilter.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/packaging/NamedInputStream.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/packaging/NativeScanner.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/packaging/PackageFilter.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/packaging/Scanner.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/packaging/XmlHelper.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransaction.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransactionFactory.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/util/CacheModeHelper.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/util/LockModeTypeHelper.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/util/LogHelper.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/util/NamingHelper.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/ejb/util/PersistenceUtilHelper.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/engine/EJB3CascadeStyle.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/java/org/hibernate/engine/EJB3CascadingAction.java (100%) rename {entitymanager => hibernate-entitymanager}/src/main/javadoc/jdstyle.css (100%) rename {entitymanager => hibernate-entitymanager}/src/main/javadoc/package.html (100%) rename {entitymanager => hibernate-entitymanager}/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider (100%) rename {entitymanager => hibernate-entitymanager}/src/main/resources/org/hibernate/ejb/persistence_1_0.xsd (100%) rename {entitymanager => hibernate-entitymanager}/src/main/resources/org/hibernate/ejb/persistence_2_0.xsd (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/cfgxmlpar/META-INF/persistence.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/defaultpar/META-INF/orm.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/defaultpar/META-INF/persistence.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/defaultpar/org/hibernate/ejb/test/pack/defaultpar/Mouse.hbm.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/defaultpar_1_0/META-INF/orm.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/defaultpar_1_0/META-INF/persistence.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/defaultpar_1_0/org/hibernate/ejb/test/pack/defaultpar_1_0/Mouse1.hbm.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/excludehbmpar/META-INF/orm2.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/excludehbmpar/META-INF/persistence.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/excludehbmpar/org/hibernate/ejb/test/pack/excludehbmpar/Mouse.hbm.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/explicitpar/META-INF/orm.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/explicitpar/META-INF/persistence.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/explodedpar/META-INF/persistence.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/explodedpar/org/hibernate/ejb/test/pack/explodedpar/Elephant.hbm.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/externaljar/META-INF/orm.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/overridenpar/META-INF/persistence.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/space par/META-INF/persistence.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/war/WEB-INF/classes/META-INF/orm.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/bundles/war/WEB-INF/classes/org/hibernate/ejb/test/pack/war/Mouse.hbm.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/NoPackageEntity.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/criteria/CriteriaCompilingTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/criteria/QueryBuilderTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/criteria/basic/AggregationResultTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/criteria/basic/BasicCriteriaUsageTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/criteria/basic/ExpressionsTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/criteria/basic/PredicateTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/criteria/basic/Wall.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/criteria/components/Client.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/criteria/components/ComponentCriteriaTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/criteria/components/Name.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/criteria/paths/ImplicitJoinTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/criteria/subquery/CorrelatedSubqueryTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/criteria/subquery/UncorrelatedSubqueryTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/criteria/tuple/TupleCriteriaTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/metamodel/AbstractMetamodelSpecificTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/metamodel/Address.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/metamodel/Alias.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/metamodel/Country.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/metamodel/CreditCard.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/metamodel/Customer.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/metamodel/EmbeddedTypeTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/metamodel/Info.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/metamodel/LineItem.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/metamodel/Order.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/metamodel/Phone.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/metamodel/Product.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/metamodel/ShelfLife.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/metamodel/Spouse.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/Cat.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/Distributor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/Item.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/Kitten.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/LastUpdateListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/MyNamingStrategy.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/NoOpListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/TestCase.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/Wallet.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/association/AssociationTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/association/Incident.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/association/IncidentStatus.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/association/Kitchen.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/association/Oven.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/beanvalidation/BeanValidationTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/beanvalidation/CupHolder.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cacheable/annotation/ConfigurationTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cacheable/annotation/ExplicitlyCacheableEntity.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cacheable/annotation/ExplicitlyNonCacheableEntity.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cacheable/annotation/NoCacheableAnnotationEntity.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cacheable/cachemodes/SharedCacheModesTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cacheable/cachemodes/SimpleEntity.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/callbacks/CallbacksTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/callbacks/CommunicationSystem.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/callbacks/CountryChecker.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/callbacks/CountryNameCheckerListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/callbacks/Customer.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/callbacks/Employee.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/callbacks/ExceptionListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/callbacks/FirstOneListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/callbacks/IncreaseListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/callbacks/Person.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/callbacks/Plant.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/callbacks/RemoteControl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/callbacks/Rythm.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/callbacks/Television.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/callbacks/Translation.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/callbacks/VideoSystem.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cascade/Author.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cascade/CascadeTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cascade/Conference.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cascade/DetachAndContainsTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocument.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocumentInfo.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cascade/FetchTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cascade/FetchTest2.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cascade/Grandson.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cascade/Parent.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cascade/Soldier.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cascade/Soldier2.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cascade/Son.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cascade/Song.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cascade/Student.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cascade/Teacher.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cascade/Troop.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/cascade/Troop2.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/connection/FakeDataSource.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/connection/FakeDataSourceException.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ejb3configuration/ConfigurationObjectSettingTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ejb3configuration/EntityManagerSerializationTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ejb3configuration/InterceptorTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ejb3configuration/PersistenceUnitInfoAdapter.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/Cat.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/Colony.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/Competition.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/Competitor.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/Decorate.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/Dog.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/Dress.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/Empire.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/FlushModeTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/GetReferenceTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/Mail.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/MergeTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/Music.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/Pet.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/Race.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/RefreshTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/RemoveTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/cascade/A.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/cascade/B1.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/cascade/B2.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/cascade/B3.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/cascade/B4.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/cascade/C1.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/cascade/C2.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/exception/ExceptionTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/exception/Instrument.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/exception/Music.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/exception/Musician.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/inheritance/Fruit.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/inheritance/InheritanceTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/inheritance/Strawberry.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/instrument/InstrumentedClassLoader.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/instrument/InterceptFieldClassFileTransformerTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/instrument/Simple.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/jee/OrmVersionTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/lob/BlobTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/lob/ImageReader.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/lock/Lock.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/lock/LockTest.java (99%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/lock/Lockable.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/lock/QueryLockingTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/lock/UnversionedLock.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/mapping/Phone.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/mapping/QuotingTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/Address.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/Animal.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/Being.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/Cat.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/Cattish.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/Child.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/DeskWithRawType.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/Dog.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/EmployeeWithRawType.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/Feline.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/Flower.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/FoodItem.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/Fridge.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/Garden.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/House.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/JoinedManyToOneOwner.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/MetadataTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/Parent.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/Person.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/Room.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/SecondMetadataTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/SimpleMedicalHistory.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/SimplePerson.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/StaticMetadataTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/SubThing.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/Thing.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/metadata/WithGenericCollection.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ops/Animal.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ops/Employee.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ops/Employer.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ops/FindTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ops/GetLoadTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ops/Mammal.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ops/MergeNewTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ops/MergeTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ops/Node.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ops/NumberedNode.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ops/Reptile.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/ops/Workload.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/cfgxmlpar/Morito.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/defaultpar/ApplicationServer.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/defaultpar/IncrementListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Lighter.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Money.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Mouse.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/defaultpar/OtherIncrementListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Version.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/defaultpar/package-info.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/ApplicationServer1.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/IncrementListener1.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/Lighter1.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/Money1.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/Mouse1.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/OtherIncrementListener1.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/Version1.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/package-info.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/excludehbmpar/Caipirinha.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/explicitpar/Washer.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/explodedpar/Carpet.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/explodedpar/Elephant.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/explodedpar/package-info.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/externaljar/Scooter.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/various/Airplane.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/various/Seat.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/war/ApplicationServer.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/war/IncrementListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/war/Lighter.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/war/Money.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/war/Mouse.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/war/OtherIncrementListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/war/Version.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/pack/war/package-info.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/packaging/CustomScanner.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/packaging/PackagedEntityManagerTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/packaging/PackagingTestCase.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/packaging/Pasta.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/packaging/ScannerTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/query/ComponentJoinsTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/query/QueryTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/transaction/Book.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/util/Author.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/util/Book.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/util/CopyrightableContent.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/util/GetIdentifierTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/util/IsLoadedTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/util/PersistenceUtilHelperTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/util/Sickness.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/util/Umbrella.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/xml/Address.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/xml/Article.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/xml/CounterListener.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/xml/Employee.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/xml/Light.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/xml/Lighter.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/xml/XmlTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/xml/sequences/Address.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/xml/sequences/Article.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/xml/sequences/Employee.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/xml/sequences/Light.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/xml/sequences/Lighter.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/xml/sequences/XmlAttributeOverrideTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/java/org/hibernate/ejb/test/xml/sequences/XmlTest.java (100%) rename {entitymanager => hibernate-entitymanager}/src/test/resources/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/resources/org/hibernate/ejb/test/hibernate.cfg.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/resources/org/hibernate/ejb/test/jee/invalid-orm-1.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/resources/org/hibernate/ejb/test/jee/valid-orm-1.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/resources/org/hibernate/ejb/test/jee/valid-orm-2.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/resources/org/hibernate/ejb/test/mapping/orm.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/resources/org/hibernate/ejb/test/ops/Employer.hbm.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/resources/org/hibernate/ejb/test/ops/Node.hbm.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/resources/org/hibernate/ejb/test/xml/orm.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/resources/org/hibernate/ejb/test/xml/orm2.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/resources/org/hibernate/ejb/test/xml/orm3.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm2.xml (100%) rename {entitymanager => hibernate-entitymanager}/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm3.xml (100%) diff --git a/build.gradle b/build.gradle index d7fd99dff72d..b2613ed51521 100644 --- a/build.gradle +++ b/build.gradle @@ -72,18 +72,18 @@ subprojects { subProject -> group = 'org.hibernate' version = '4.0.0-SNAPSHOT' + defaultTasks 'build' + // minimize changes, at least for now (gradle uses 'build' by default).. buildDirName = "target" - if ( 'hibernate-release' == subProject.name ) { - apply plugin : 'base' - } - else { - apply plugin: 'java' +// if ( 'hibernate-release' == subProject.name ) { +// apply plugin : 'base' +// } +// else { + if ( 'hibernate-release' != subProject.name ) { apply plugin: 'maven' // for install task as well as deploy dependencies - defaultTasks 'build' - configurations { provided { // todo : need to make sure these are non-exported diff --git a/entitymanager/.cvsignore b/entitymanager/.cvsignore deleted file mode 100644 index 767b033f7c52..000000000000 --- a/entitymanager/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -build.properties -build -target -test_output diff --git a/entitymanager/pom.xml b/entitymanager/pom.xml deleted file mode 100644 index 063ac30d5934..000000000000 --- a/entitymanager/pom.xml +++ /dev/null @@ -1,208 +0,0 @@ - - - - 4.0.0 - - - org.hibernate - hibernate-parent - 3.6.0-SNAPSHOT - ../parent/pom.xml - - - org.hibernate - hibernate-entitymanager - jar - - Hibernate Entity Manager - Hibernate Entity Manager - - - - ${project.groupId} - hibernate-core - ${project.version} - - - cglib - cglib - - - javassist - javassist - - - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - - - javax.validation - validation-api - true - - - org.hibernate - hibernate-validator - test - - - ${groupId} - hibernate-testing - ${version} - test - - - org.jboss.shrinkwrap - shrinkwrap-api - 1.0.0-alpha-6 - test - - - org.jboss.shrinkwrap - shrinkwrap-impl-base - 1.0.0-alpha-6 - test - - - - ${project.groupId} - hibernate-jpamodelgen - 1.0.0.Final - test - - - - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - - - - - - - - - true - src/test/resources - - - true - src/test/bundles - ../bundles - - - - - org.jboss.maven.plugins - maven-injection-plugin - - - - ${pom.version} - - - org.hibernate.ejb.Version - getVersionString - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - - - - - - - - - - - - process_annotations - process-test-sources - - - ${project.build.directory}/generated-src/jpamodelgen - - - run - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*TestCase.java - - - - - - - - - doc - - - - org.jboss.maven.plugins - maven-jdocbook-plugin - - master.xml - ${basedir}/src/main/docbook - en - - ${basedir}/src/main/docbook/en/images - - - - - make-doc - package - - resources - generate - - - - - - - - - jaxb - - 1.5 - - - - javax.xml.bind - jaxb-api - 2.1 - test - - - com.sun.xml.bind - jaxb-impl - 2.1.3 - test - - - - - diff --git a/entitymanager/src/test/bundles/overridenpar/overridenpar.properties b/entitymanager/src/test/bundles/overridenpar/overridenpar.properties deleted file mode 100644 index d05eed05b0ae..000000000000 --- a/entitymanager/src/test/bundles/overridenpar/overridenpar.properties +++ /dev/null @@ -1,5 +0,0 @@ -hibernate.connection.driver_class ${jdbc.driver} -hibernate.connection.url ${jdbc.url} -hibernate.connection.username ${jdbc.user} -hibernate.connection.password ${jdbc.pass} -hibernate.connection.isolation ${jdbc.isolation} \ No newline at end of file diff --git a/entitymanager/src/test/resources/hibernate.properties b/entitymanager/src/test/resources/hibernate.properties deleted file mode 100644 index 1d81cd42ea77..000000000000 --- a/entitymanager/src/test/resources/hibernate.properties +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved. # -# # -# This copyrighted material is made available to anyone wishing to use, modify,# -# copy, or redistribute it subject to the terms and conditions of the GNU # -# Lesser General Public License, v. 2.1. This program is distributed in the # -# hope that it will be useful, but WITHOUT A WARRANTY; without even the implied# -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # -# Lesser General Public License for more details. You should have received a # -# copy of the GNU Lesser General Public License, v.2.1 along with this # -# distribution; if not, write to the Free Software Foundation, Inc., # -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# # -# Red Hat Author(s): Steve Ebersole # -################################################################################ -hibernate.dialect ${db.dialect} -hibernate.connection.driver_class ${jdbc.driver} -hibernate.connection.url ${jdbc.url} -hibernate.connection.username ${jdbc.user} -hibernate.connection.password ${jdbc.pass} -hibernate.connection.isolation ${jdbc.isolation} - -hibernate.connection.pool_size 5 - -hibernate.show_sql true -hibernate.format_sql true - -hibernate.max_fetch_depth 5 - -hibernate.cache.region_prefix hibernate.test -hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider - -hibernate.jdbc.batch_size 0 diff --git a/entitymanager/src/test/resources/log4j.properties b/entitymanager/src/test/resources/log4j.properties deleted file mode 100755 index 29d8ee3281fe..000000000000 --- a/entitymanager/src/test/resources/log4j.properties +++ /dev/null @@ -1,39 +0,0 @@ -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n - -log4j.rootLogger=warn, stdout - -log4j.logger.org.hibernate=debug -#log4j.logger.org.hibernate=debug - -log4j.logger.org.hibernate.ejb=debug -log4j.logger.org.hibernate.ejb.packaging=debug -log4j.logger.org.hibernate.reflection=debug - -#log4j.logger.org.hibernate.engine.Cascades=debug -#log4j.logger.org.hibernate.hql=debug - -### log just the SQL -log4j.logger.org.hibernate.SQL=debug - -### log JDBC bind parameters ### -#log4j.logger.org.hibernate.type=info -log4j.logger.org.hibernate.type=trace - -### log schema export/update ### -log4j.logger.org.hibernate.tool.hbm2ddl=debug - -### log HQL parse trees -#log4j.logger.org.hibernate.hql=debug - -### log cache activity ### -#log4j.logger.org.hibernate.cache=debug - -### log JDBC resource acquisition -#log4j.logger.org.hibernate.jdbc=debug - -### enable the following line if you want to track down connection ### -### leakages when using DriverManagerConnectionProvider ### -#log4j.logger.org.hibernate.connection.DriverManagerConnectionProvider=trace diff --git a/entitymanager/build.xml b/hibernate-entitymanager/build.xml similarity index 100% rename from entitymanager/build.xml rename to hibernate-entitymanager/build.xml diff --git a/hibernate-entitymanager/hibernate-entitymanager.gradle b/hibernate-entitymanager/hibernate-entitymanager.gradle new file mode 100644 index 000000000000..0ed310056a1e --- /dev/null +++ b/hibernate-entitymanager/hibernate-entitymanager.gradle @@ -0,0 +1,58 @@ +apply plugin: 'java' + +// todo : there are test failures due to issues with how 'bundles' are handled. +// My guess is using TCCL as the tests try to is not valid in Gradle. + + +// not needed if we rename the directories to match the sourceSet name +sourceSets { + test { + // resources inherently exclude sources + resources { + setSrcDirs( ['src/test/java','src/test/resources'] ) + } + } +} + +dependencies { + shrinkwrapVersion = '1.0.0-alpha-6' + + compile( project(':hibernate-core') ) + compile( libraries.dom4j ) + compile( libraries.commons_annotations ) + compile( libraries.jpa ) + compile( libraries.jta ) + compile( libraries.javassist ) + testCompile( project(':hibernate-core').sourceSets.test.classes ) + testCompile( libraries.junit ) + testCompile( libraries.jpa_modelgen ) + testCompile( libraries.shrinkwrap_api ) + testCompile( libraries.shrinkwrap ) + testCompile( libraries.validation ) + testCompile( libraries.slf4j_api ) + testRuntime( libraries.validator ) +} + +procTargetDirName = buildDirName + "/generated-src/jpamodelgen" +procTargetDir = dir( procTargetDirName ) +compileJava { + configure( options ) { + compilerArgs = [ "-s", "$procTargetDir.dir.absolutePath" ] + } +} +compileJava.dependsOn procTargetDir + +bundlesTargetDirName = "$buildDirName/bundles" +bundlesTargetDir = dir( bundlesTargetDirName ) +task processBundleResources { + copy { + from 'src/test/bundles' + into bundlesTargetDir.dir + } +} +processBundleResources.dependsOn bundlesTargetDir + +//ideaModule { +// testSourceDirs.add( file( procTargetDirName ) ) +//} + diff --git a/entitymanager/src/main/docbook/en/master.xml b/hibernate-entitymanager/src/main/docbook/en/master.xml similarity index 100% rename from entitymanager/src/main/docbook/en/master.xml rename to hibernate-entitymanager/src/main/docbook/en/master.xml diff --git a/entitymanager/src/main/docbook/en/modules/architecture.xml b/hibernate-entitymanager/src/main/docbook/en/modules/architecture.xml similarity index 100% rename from entitymanager/src/main/docbook/en/modules/architecture.xml rename to hibernate-entitymanager/src/main/docbook/en/modules/architecture.xml diff --git a/entitymanager/src/main/docbook/en/modules/batch.xml b/hibernate-entitymanager/src/main/docbook/en/modules/batch.xml similarity index 100% rename from entitymanager/src/main/docbook/en/modules/batch.xml rename to hibernate-entitymanager/src/main/docbook/en/modules/batch.xml diff --git a/entitymanager/src/main/docbook/en/modules/configuration.xml b/hibernate-entitymanager/src/main/docbook/en/modules/configuration.xml similarity index 100% rename from entitymanager/src/main/docbook/en/modules/configuration.xml rename to hibernate-entitymanager/src/main/docbook/en/modules/configuration.xml diff --git a/entitymanager/src/main/docbook/en/modules/entitymanagerapi.xml b/hibernate-entitymanager/src/main/docbook/en/modules/entitymanagerapi.xml similarity index 100% rename from entitymanager/src/main/docbook/en/modules/entitymanagerapi.xml rename to hibernate-entitymanager/src/main/docbook/en/modules/entitymanagerapi.xml diff --git a/entitymanager/src/main/docbook/en/modules/listeners.xml b/hibernate-entitymanager/src/main/docbook/en/modules/listeners.xml similarity index 100% rename from entitymanager/src/main/docbook/en/modules/listeners.xml rename to hibernate-entitymanager/src/main/docbook/en/modules/listeners.xml diff --git a/entitymanager/src/main/docbook/en/modules/metamodel.xml b/hibernate-entitymanager/src/main/docbook/en/modules/metamodel.xml similarity index 100% rename from entitymanager/src/main/docbook/en/modules/metamodel.xml rename to hibernate-entitymanager/src/main/docbook/en/modules/metamodel.xml diff --git a/entitymanager/src/main/docbook/en/modules/query_criteria.xml b/hibernate-entitymanager/src/main/docbook/en/modules/query_criteria.xml similarity index 100% rename from entitymanager/src/main/docbook/en/modules/query_criteria.xml rename to hibernate-entitymanager/src/main/docbook/en/modules/query_criteria.xml diff --git a/entitymanager/src/main/docbook/en/modules/query_ejbql.xml b/hibernate-entitymanager/src/main/docbook/en/modules/query_ejbql.xml similarity index 100% rename from entitymanager/src/main/docbook/en/modules/query_ejbql.xml rename to hibernate-entitymanager/src/main/docbook/en/modules/query_ejbql.xml diff --git a/entitymanager/src/main/docbook/en/modules/query_native.xml b/hibernate-entitymanager/src/main/docbook/en/modules/query_native.xml similarity index 100% rename from entitymanager/src/main/docbook/en/modules/query_native.xml rename to hibernate-entitymanager/src/main/docbook/en/modules/query_native.xml diff --git a/entitymanager/src/main/docbook/en/modules/transactions.xml b/hibernate-entitymanager/src/main/docbook/en/modules/transactions.xml similarity index 100% rename from entitymanager/src/main/docbook/en/modules/transactions.xml rename to hibernate-entitymanager/src/main/docbook/en/modules/transactions.xml diff --git a/entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/AbstractQueryImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractQueryImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/AbstractQueryImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractQueryImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/AvailableSettings.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/AvailableSettings.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/AvailableSettings.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/AvailableSettings.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/CurrentEntityManagerImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/CurrentEntityManagerImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/CurrentEntityManagerImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/CurrentEntityManagerImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/EntityManagerImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/EntityManagerImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/EventListenerConfigurator.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/EventListenerConfigurator.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/EventListenerConfigurator.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/EventListenerConfigurator.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManager.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManager.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManager.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManager.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerFactory.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerFactory.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerFactory.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerFactory.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/HibernateQuery.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateQuery.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/HibernateQuery.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateQuery.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/InjectionSettingsFactory.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/InjectionSettingsFactory.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/InjectionSettingsFactory.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/InjectionSettingsFactory.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/QueryHints.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/QueryHints.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/QueryHints.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/QueryHints.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/TransactionImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/TransactionImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/TransactionImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/TransactionImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/Version.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/Version.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/Version.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/Version.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/AbstractNode.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/AbstractNode.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/AbstractNode.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/AbstractNode.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicPathUsageException.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicPathUsageException.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicPathUsageException.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicPathUsageException.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/CollectionJoinImplementor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CollectionJoinImplementor.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/CollectionJoinImplementor.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CollectionJoinImplementor.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaBuilderImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaBuilderImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaBuilderImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaBuilderImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryCompiler.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryCompiler.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryCompiler.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryCompiler.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaSubqueryImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaSubqueryImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaSubqueryImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaSubqueryImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/ExpressionImplementor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/ExpressionImplementor.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/ExpressionImplementor.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/ExpressionImplementor.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/FromImplementor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/FromImplementor.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/FromImplementor.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/FromImplementor.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/IllegalDereferenceException.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/IllegalDereferenceException.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/IllegalDereferenceException.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/IllegalDereferenceException.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/JoinImplementor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/JoinImplementor.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/JoinImplementor.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/JoinImplementor.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/ListJoinImplementor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/ListJoinImplementor.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/ListJoinImplementor.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/ListJoinImplementor.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/MapJoinImplementor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/MapJoinImplementor.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/MapJoinImplementor.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/MapJoinImplementor.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/OrderImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/OrderImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/OrderImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/OrderImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/ParameterContainer.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/ParameterContainer.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/ParameterContainer.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/ParameterContainer.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/ParameterRegistry.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/ParameterRegistry.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/ParameterRegistry.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/ParameterRegistry.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/PathImplementor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/PathImplementor.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/PathImplementor.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/PathImplementor.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/PathSource.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/PathSource.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/PathSource.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/PathSource.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryStructure.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryStructure.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryStructure.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryStructure.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/Renderable.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/Renderable.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/Renderable.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/Renderable.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/SelectionImplementor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/SelectionImplementor.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/SelectionImplementor.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/SelectionImplementor.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/SetJoinImplementor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/SetJoinImplementor.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/SetJoinImplementor.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/SetJoinImplementor.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/TupleElementImplementor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/TupleElementImplementor.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/TupleElementImplementor.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/TupleElementImplementor.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/ValueHandlerFactory.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/ValueHandlerFactory.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/ValueHandlerFactory.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/ValueHandlerFactory.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/AbstractTupleElement.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/AbstractTupleElement.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/AbstractTupleElement.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/AbstractTupleElement.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryArithmeticOperation.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryArithmeticOperation.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryArithmeticOperation.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryArithmeticOperation.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryOperatorExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryOperatorExpression.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryOperatorExpression.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryOperatorExpression.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CoalesceExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CoalesceExpression.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CoalesceExpression.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CoalesceExpression.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CompoundSelectionImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CompoundSelectionImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CompoundSelectionImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CompoundSelectionImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ConcatExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ConcatExpression.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ConcatExpression.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ConcatExpression.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/EntityTypeExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/EntityTypeExpression.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/EntityTypeExpression.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/EntityTypeExpression.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ExpressionImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ExpressionImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ExpressionImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ExpressionImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ListIndexExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ListIndexExpression.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ListIndexExpression.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ListIndexExpression.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/LiteralExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/LiteralExpression.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/LiteralExpression.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/LiteralExpression.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/MapEntryExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/MapEntryExpression.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/MapEntryExpression.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/MapEntryExpression.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/NullLiteralExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/NullLiteralExpression.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/NullLiteralExpression.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/NullLiteralExpression.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/NullifExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/NullifExpression.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/NullifExpression.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/NullifExpression.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ParameterExpressionImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ParameterExpressionImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ParameterExpressionImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ParameterExpressionImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/PathTypeExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/PathTypeExpression.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/PathTypeExpression.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/PathTypeExpression.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SearchedCaseExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SearchedCaseExpression.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SearchedCaseExpression.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SearchedCaseExpression.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SelectionImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SelectionImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SelectionImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SelectionImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SimpleCaseExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SimpleCaseExpression.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SimpleCaseExpression.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SimpleCaseExpression.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SizeOfCollectionExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SizeOfCollectionExpression.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SizeOfCollectionExpression.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SizeOfCollectionExpression.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SubqueryComparisonModifierExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SubqueryComparisonModifierExpression.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SubqueryComparisonModifierExpression.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SubqueryComparisonModifierExpression.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/UnaryArithmeticOperation.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/UnaryArithmeticOperation.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/UnaryArithmeticOperation.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/UnaryArithmeticOperation.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/UnaryOperatorExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/UnaryOperatorExpression.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/UnaryOperatorExpression.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/UnaryOperatorExpression.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AbsFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AbsFunction.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AbsFunction.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AbsFunction.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AggregationFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AggregationFunction.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AggregationFunction.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AggregationFunction.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/BasicFunctionExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/BasicFunctionExpression.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/BasicFunctionExpression.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/BasicFunctionExpression.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CastFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CastFunction.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CastFunction.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CastFunction.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentDateFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentDateFunction.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentDateFunction.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentDateFunction.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimeFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimeFunction.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimeFunction.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimeFunction.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimestampFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimestampFunction.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimestampFunction.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimestampFunction.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/FunctionExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/FunctionExpression.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/FunctionExpression.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/FunctionExpression.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LengthFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LengthFunction.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LengthFunction.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LengthFunction.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LocateFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LocateFunction.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LocateFunction.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LocateFunction.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LowerFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LowerFunction.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LowerFunction.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LowerFunction.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/ParameterizedFunctionExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/ParameterizedFunctionExpression.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/ParameterizedFunctionExpression.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/ParameterizedFunctionExpression.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SqrtFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SqrtFunction.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SqrtFunction.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SqrtFunction.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SubstringFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SubstringFunction.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SubstringFunction.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SubstringFunction.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/TrimFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/TrimFunction.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/TrimFunction.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/TrimFunction.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/UpperFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/UpperFunction.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/UpperFunction.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/UpperFunction.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractFromImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractFromImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractFromImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractFromImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractJoinImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractJoinImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractJoinImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractJoinImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractPathImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractPathImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractPathImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractPathImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/path/CollectionAttributeJoin.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/CollectionAttributeJoin.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/path/CollectionAttributeJoin.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/CollectionAttributeJoin.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/path/ListAttributeJoin.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/ListAttributeJoin.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/path/ListAttributeJoin.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/ListAttributeJoin.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/path/MapAttributeJoin.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/MapAttributeJoin.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/path/MapAttributeJoin.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/MapAttributeJoin.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/path/MapKeyHelpers.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/MapKeyHelpers.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/path/MapKeyHelpers.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/MapKeyHelpers.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/path/PluralAttributeJoinSupport.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/PluralAttributeJoinSupport.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/path/PluralAttributeJoinSupport.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/PluralAttributeJoinSupport.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/path/PluralAttributePath.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/PluralAttributePath.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/path/PluralAttributePath.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/PluralAttributePath.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/path/RootImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/RootImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/path/RootImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/RootImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SetAttributeJoin.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SetAttributeJoin.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SetAttributeJoin.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SetAttributeJoin.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SingularAttributeJoin.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SingularAttributeJoin.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SingularAttributeJoin.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SingularAttributeJoin.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SingularAttributePath.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SingularAttributePath.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SingularAttributePath.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SingularAttributePath.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractPredicateImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractPredicateImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractPredicateImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractPredicateImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractSimplePredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractSimplePredicate.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractSimplePredicate.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractSimplePredicate.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BetweenPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BetweenPredicate.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BetweenPredicate.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BetweenPredicate.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanAssertionPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanAssertionPredicate.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanAssertionPredicate.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanAssertionPredicate.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanExpressionPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanExpressionPredicate.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanExpressionPredicate.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanExpressionPredicate.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanStaticAssertionPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanStaticAssertionPredicate.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanStaticAssertionPredicate.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanStaticAssertionPredicate.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ComparisonPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ComparisonPredicate.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ComparisonPredicate.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ComparisonPredicate.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/CompoundPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/CompoundPredicate.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/CompoundPredicate.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/CompoundPredicate.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExistsPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExistsPredicate.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExistsPredicate.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExistsPredicate.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExplicitTruthValueCheck.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExplicitTruthValueCheck.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExplicitTruthValueCheck.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExplicitTruthValueCheck.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/InPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/InPredicate.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/InPredicate.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/InPredicate.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/IsEmptyPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/IsEmptyPredicate.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/IsEmptyPredicate.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/IsEmptyPredicate.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/LikePredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/LikePredicate.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/LikePredicate.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/LikePredicate.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/MemberOfPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/MemberOfPredicate.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/MemberOfPredicate.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/MemberOfPredicate.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/NullnessPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/NullnessPredicate.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/NullnessPredicate.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/NullnessPredicate.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/TruthValue.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/TruthValue.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/TruthValue.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/TruthValue.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/BeanCallback.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/BeanCallback.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/event/BeanCallback.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/BeanCallback.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/Callback.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/Callback.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/event/Callback.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/Callback.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/CallbackHandlerConsumer.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/CallbackHandlerConsumer.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/event/CallbackHandlerConsumer.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/CallbackHandlerConsumer.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/CallbackResolver.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/CallbackResolver.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/event/CallbackResolver.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/CallbackResolver.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3AutoFlushEventListener.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3AutoFlushEventListener.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/event/EJB3AutoFlushEventListener.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3AutoFlushEventListener.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3FlushEntityEventListener.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3FlushEntityEventListener.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/event/EJB3FlushEntityEventListener.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3FlushEntityEventListener.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3FlushEventListener.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3FlushEventListener.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/event/EJB3FlushEventListener.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3FlushEventListener.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3MergeEventListener.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3MergeEventListener.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/event/EJB3MergeEventListener.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3MergeEventListener.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PersistEventListener.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PersistEventListener.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PersistEventListener.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PersistEventListener.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PersistOnFlushEventListener.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PersistOnFlushEventListener.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PersistOnFlushEventListener.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PersistOnFlushEventListener.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostDeleteEventListener.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostDeleteEventListener.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostDeleteEventListener.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostDeleteEventListener.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostInsertEventListener.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostInsertEventListener.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostInsertEventListener.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostInsertEventListener.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostLoadEventListener.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostLoadEventListener.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostLoadEventListener.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostLoadEventListener.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostUpdateEventListener.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostUpdateEventListener.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostUpdateEventListener.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostUpdateEventListener.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3SaveEventListener.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3SaveEventListener.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/event/EJB3SaveEventListener.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3SaveEventListener.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/ListenerCallback.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/ListenerCallback.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/event/ListenerCallback.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/ListenerCallback.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/instrument/InterceptFieldClassFileTransformer.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/instrument/InterceptFieldClassFileTransformer.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/instrument/InterceptFieldClassFileTransformer.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/instrument/InterceptFieldClassFileTransformer.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractAttribute.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractAttribute.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractAttribute.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractAttribute.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractIdentifiableType.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractIdentifiableType.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractIdentifiableType.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractIdentifiableType.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractManagedType.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractManagedType.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractManagedType.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractManagedType.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractType.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractType.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractType.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractType.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeFactory.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeFactory.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeFactory.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeFactory.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeImplementor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeImplementor.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeImplementor.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeImplementor.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/metamodel/BasicTypeImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/BasicTypeImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/metamodel/BasicTypeImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/BasicTypeImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/metamodel/EmbeddableTypeImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/EmbeddableTypeImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/metamodel/EmbeddableTypeImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/EmbeddableTypeImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/metamodel/EntityTypeImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/EntityTypeImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/metamodel/EntityTypeImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/EntityTypeImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/metamodel/MappedSuperclassTypeImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/MappedSuperclassTypeImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/metamodel/MappedSuperclassTypeImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/MappedSuperclassTypeImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetadataContext.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetadataContext.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetadataContext.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetadataContext.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetamodelImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetamodelImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetamodelImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetamodelImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/metamodel/PluralAttributeImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/PluralAttributeImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/metamodel/PluralAttributeImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/PluralAttributeImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/metamodel/SingularAttributeImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/SingularAttributeImpl.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/metamodel/SingularAttributeImpl.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/SingularAttributeImpl.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/ClassFilter.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/ClassFilter.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/packaging/ClassFilter.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/ClassFilter.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/Entry.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/Entry.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/packaging/Entry.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/Entry.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/FileFilter.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/FileFilter.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/packaging/FileFilter.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/FileFilter.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/Filter.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/Filter.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/packaging/Filter.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/Filter.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/InputStreamZippedJarVisitor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/InputStreamZippedJarVisitor.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/packaging/InputStreamZippedJarVisitor.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/InputStreamZippedJarVisitor.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/JarProtocolVisitor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/JarProtocolVisitor.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/packaging/JarProtocolVisitor.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/JarProtocolVisitor.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/JarVisitor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/JarVisitor.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/packaging/JarVisitor.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/JarVisitor.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/JarVisitorFactory.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/JarVisitorFactory.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/packaging/JarVisitorFactory.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/JarVisitorFactory.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/JavaElementFilter.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/JavaElementFilter.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/packaging/JavaElementFilter.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/JavaElementFilter.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/NamedInputStream.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/NamedInputStream.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/packaging/NamedInputStream.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/NamedInputStream.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/NativeScanner.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/NativeScanner.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/packaging/NativeScanner.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/NativeScanner.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/PackageFilter.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/PackageFilter.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/packaging/PackageFilter.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/PackageFilter.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/Scanner.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/Scanner.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/packaging/Scanner.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/Scanner.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/XmlHelper.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/XmlHelper.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/packaging/XmlHelper.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/XmlHelper.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransaction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransaction.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransaction.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransaction.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransactionFactory.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransactionFactory.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransactionFactory.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransactionFactory.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/util/CacheModeHelper.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/CacheModeHelper.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/util/CacheModeHelper.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/CacheModeHelper.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/util/LockModeTypeHelper.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/LockModeTypeHelper.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/util/LockModeTypeHelper.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/LockModeTypeHelper.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/util/LogHelper.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/LogHelper.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/util/LogHelper.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/LogHelper.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/util/NamingHelper.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/NamingHelper.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/util/NamingHelper.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/NamingHelper.java diff --git a/entitymanager/src/main/java/org/hibernate/ejb/util/PersistenceUtilHelper.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/PersistenceUtilHelper.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/ejb/util/PersistenceUtilHelper.java rename to hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/PersistenceUtilHelper.java diff --git a/entitymanager/src/main/java/org/hibernate/engine/EJB3CascadeStyle.java b/hibernate-entitymanager/src/main/java/org/hibernate/engine/EJB3CascadeStyle.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/engine/EJB3CascadeStyle.java rename to hibernate-entitymanager/src/main/java/org/hibernate/engine/EJB3CascadeStyle.java diff --git a/entitymanager/src/main/java/org/hibernate/engine/EJB3CascadingAction.java b/hibernate-entitymanager/src/main/java/org/hibernate/engine/EJB3CascadingAction.java similarity index 100% rename from entitymanager/src/main/java/org/hibernate/engine/EJB3CascadingAction.java rename to hibernate-entitymanager/src/main/java/org/hibernate/engine/EJB3CascadingAction.java diff --git a/entitymanager/src/main/javadoc/jdstyle.css b/hibernate-entitymanager/src/main/javadoc/jdstyle.css similarity index 100% rename from entitymanager/src/main/javadoc/jdstyle.css rename to hibernate-entitymanager/src/main/javadoc/jdstyle.css diff --git a/entitymanager/src/main/javadoc/package.html b/hibernate-entitymanager/src/main/javadoc/package.html similarity index 100% rename from entitymanager/src/main/javadoc/package.html rename to hibernate-entitymanager/src/main/javadoc/package.html diff --git a/entitymanager/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider b/hibernate-entitymanager/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider similarity index 100% rename from entitymanager/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider rename to hibernate-entitymanager/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider diff --git a/entitymanager/src/main/resources/org/hibernate/ejb/persistence_1_0.xsd b/hibernate-entitymanager/src/main/resources/org/hibernate/ejb/persistence_1_0.xsd similarity index 100% rename from entitymanager/src/main/resources/org/hibernate/ejb/persistence_1_0.xsd rename to hibernate-entitymanager/src/main/resources/org/hibernate/ejb/persistence_1_0.xsd diff --git a/entitymanager/src/main/resources/org/hibernate/ejb/persistence_2_0.xsd b/hibernate-entitymanager/src/main/resources/org/hibernate/ejb/persistence_2_0.xsd similarity index 100% rename from entitymanager/src/main/resources/org/hibernate/ejb/persistence_2_0.xsd rename to hibernate-entitymanager/src/main/resources/org/hibernate/ejb/persistence_2_0.xsd diff --git a/entitymanager/src/test/bundles/cfgxmlpar/META-INF/persistence.xml b/hibernate-entitymanager/src/test/bundles/cfgxmlpar/META-INF/persistence.xml similarity index 100% rename from entitymanager/src/test/bundles/cfgxmlpar/META-INF/persistence.xml rename to hibernate-entitymanager/src/test/bundles/cfgxmlpar/META-INF/persistence.xml diff --git a/entitymanager/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml b/hibernate-entitymanager/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml similarity index 100% rename from entitymanager/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml rename to hibernate-entitymanager/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml diff --git a/entitymanager/src/test/bundles/defaultpar/META-INF/orm.xml b/hibernate-entitymanager/src/test/bundles/defaultpar/META-INF/orm.xml similarity index 100% rename from entitymanager/src/test/bundles/defaultpar/META-INF/orm.xml rename to hibernate-entitymanager/src/test/bundles/defaultpar/META-INF/orm.xml diff --git a/entitymanager/src/test/bundles/defaultpar/META-INF/persistence.xml b/hibernate-entitymanager/src/test/bundles/defaultpar/META-INF/persistence.xml similarity index 100% rename from entitymanager/src/test/bundles/defaultpar/META-INF/persistence.xml rename to hibernate-entitymanager/src/test/bundles/defaultpar/META-INF/persistence.xml diff --git a/entitymanager/src/test/bundles/defaultpar/org/hibernate/ejb/test/pack/defaultpar/Mouse.hbm.xml b/hibernate-entitymanager/src/test/bundles/defaultpar/org/hibernate/ejb/test/pack/defaultpar/Mouse.hbm.xml similarity index 100% rename from entitymanager/src/test/bundles/defaultpar/org/hibernate/ejb/test/pack/defaultpar/Mouse.hbm.xml rename to hibernate-entitymanager/src/test/bundles/defaultpar/org/hibernate/ejb/test/pack/defaultpar/Mouse.hbm.xml diff --git a/entitymanager/src/test/bundles/defaultpar_1_0/META-INF/orm.xml b/hibernate-entitymanager/src/test/bundles/defaultpar_1_0/META-INF/orm.xml similarity index 100% rename from entitymanager/src/test/bundles/defaultpar_1_0/META-INF/orm.xml rename to hibernate-entitymanager/src/test/bundles/defaultpar_1_0/META-INF/orm.xml diff --git a/entitymanager/src/test/bundles/defaultpar_1_0/META-INF/persistence.xml b/hibernate-entitymanager/src/test/bundles/defaultpar_1_0/META-INF/persistence.xml similarity index 100% rename from entitymanager/src/test/bundles/defaultpar_1_0/META-INF/persistence.xml rename to hibernate-entitymanager/src/test/bundles/defaultpar_1_0/META-INF/persistence.xml diff --git a/entitymanager/src/test/bundles/defaultpar_1_0/org/hibernate/ejb/test/pack/defaultpar_1_0/Mouse1.hbm.xml b/hibernate-entitymanager/src/test/bundles/defaultpar_1_0/org/hibernate/ejb/test/pack/defaultpar_1_0/Mouse1.hbm.xml similarity index 100% rename from entitymanager/src/test/bundles/defaultpar_1_0/org/hibernate/ejb/test/pack/defaultpar_1_0/Mouse1.hbm.xml rename to hibernate-entitymanager/src/test/bundles/defaultpar_1_0/org/hibernate/ejb/test/pack/defaultpar_1_0/Mouse1.hbm.xml diff --git a/entitymanager/src/test/bundles/excludehbmpar/META-INF/orm2.xml b/hibernate-entitymanager/src/test/bundles/excludehbmpar/META-INF/orm2.xml similarity index 100% rename from entitymanager/src/test/bundles/excludehbmpar/META-INF/orm2.xml rename to hibernate-entitymanager/src/test/bundles/excludehbmpar/META-INF/orm2.xml diff --git a/entitymanager/src/test/bundles/excludehbmpar/META-INF/persistence.xml b/hibernate-entitymanager/src/test/bundles/excludehbmpar/META-INF/persistence.xml similarity index 100% rename from entitymanager/src/test/bundles/excludehbmpar/META-INF/persistence.xml rename to hibernate-entitymanager/src/test/bundles/excludehbmpar/META-INF/persistence.xml diff --git a/entitymanager/src/test/bundles/excludehbmpar/org/hibernate/ejb/test/pack/excludehbmpar/Mouse.hbm.xml b/hibernate-entitymanager/src/test/bundles/excludehbmpar/org/hibernate/ejb/test/pack/excludehbmpar/Mouse.hbm.xml similarity index 100% rename from entitymanager/src/test/bundles/excludehbmpar/org/hibernate/ejb/test/pack/excludehbmpar/Mouse.hbm.xml rename to hibernate-entitymanager/src/test/bundles/excludehbmpar/org/hibernate/ejb/test/pack/excludehbmpar/Mouse.hbm.xml diff --git a/entitymanager/src/test/bundles/explicitpar/META-INF/orm.xml b/hibernate-entitymanager/src/test/bundles/explicitpar/META-INF/orm.xml similarity index 100% rename from entitymanager/src/test/bundles/explicitpar/META-INF/orm.xml rename to hibernate-entitymanager/src/test/bundles/explicitpar/META-INF/orm.xml diff --git a/entitymanager/src/test/bundles/explicitpar/META-INF/persistence.xml b/hibernate-entitymanager/src/test/bundles/explicitpar/META-INF/persistence.xml similarity index 100% rename from entitymanager/src/test/bundles/explicitpar/META-INF/persistence.xml rename to hibernate-entitymanager/src/test/bundles/explicitpar/META-INF/persistence.xml diff --git a/entitymanager/src/test/bundles/explodedpar/META-INF/persistence.xml b/hibernate-entitymanager/src/test/bundles/explodedpar/META-INF/persistence.xml similarity index 100% rename from entitymanager/src/test/bundles/explodedpar/META-INF/persistence.xml rename to hibernate-entitymanager/src/test/bundles/explodedpar/META-INF/persistence.xml diff --git a/entitymanager/src/test/bundles/explodedpar/org/hibernate/ejb/test/pack/explodedpar/Elephant.hbm.xml b/hibernate-entitymanager/src/test/bundles/explodedpar/org/hibernate/ejb/test/pack/explodedpar/Elephant.hbm.xml similarity index 100% rename from entitymanager/src/test/bundles/explodedpar/org/hibernate/ejb/test/pack/explodedpar/Elephant.hbm.xml rename to hibernate-entitymanager/src/test/bundles/explodedpar/org/hibernate/ejb/test/pack/explodedpar/Elephant.hbm.xml diff --git a/entitymanager/src/test/bundles/externaljar/META-INF/orm.xml b/hibernate-entitymanager/src/test/bundles/externaljar/META-INF/orm.xml similarity index 100% rename from entitymanager/src/test/bundles/externaljar/META-INF/orm.xml rename to hibernate-entitymanager/src/test/bundles/externaljar/META-INF/orm.xml diff --git a/entitymanager/src/test/bundles/overridenpar/META-INF/persistence.xml b/hibernate-entitymanager/src/test/bundles/overridenpar/META-INF/persistence.xml similarity index 100% rename from entitymanager/src/test/bundles/overridenpar/META-INF/persistence.xml rename to hibernate-entitymanager/src/test/bundles/overridenpar/META-INF/persistence.xml diff --git a/entitymanager/src/test/bundles/space par/META-INF/persistence.xml b/hibernate-entitymanager/src/test/bundles/space par/META-INF/persistence.xml similarity index 100% rename from entitymanager/src/test/bundles/space par/META-INF/persistence.xml rename to hibernate-entitymanager/src/test/bundles/space par/META-INF/persistence.xml diff --git a/entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/orm.xml b/hibernate-entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/orm.xml similarity index 100% rename from entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/orm.xml rename to hibernate-entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/orm.xml diff --git a/entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml b/hibernate-entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml similarity index 100% rename from entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml rename to hibernate-entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml diff --git a/entitymanager/src/test/bundles/war/WEB-INF/classes/org/hibernate/ejb/test/pack/war/Mouse.hbm.xml b/hibernate-entitymanager/src/test/bundles/war/WEB-INF/classes/org/hibernate/ejb/test/pack/war/Mouse.hbm.xml similarity index 100% rename from entitymanager/src/test/bundles/war/WEB-INF/classes/org/hibernate/ejb/test/pack/war/Mouse.hbm.xml rename to hibernate-entitymanager/src/test/bundles/war/WEB-INF/classes/org/hibernate/ejb/test/pack/war/Mouse.hbm.xml diff --git a/entitymanager/src/test/java/NoPackageEntity.java b/hibernate-entitymanager/src/test/java/NoPackageEntity.java similarity index 100% rename from entitymanager/src/test/java/NoPackageEntity.java rename to hibernate-entitymanager/src/test/java/NoPackageEntity.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/criteria/CriteriaCompilingTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/CriteriaCompilingTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/criteria/CriteriaCompilingTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/CriteriaCompilingTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/criteria/QueryBuilderTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/QueryBuilderTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/criteria/QueryBuilderTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/QueryBuilderTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/AggregationResultTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/AggregationResultTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/AggregationResultTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/AggregationResultTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/BasicCriteriaUsageTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/BasicCriteriaUsageTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/BasicCriteriaUsageTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/BasicCriteriaUsageTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/ExpressionsTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/ExpressionsTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/ExpressionsTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/ExpressionsTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/PredicateTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/PredicateTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/PredicateTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/PredicateTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/Wall.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/Wall.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/Wall.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/Wall.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/criteria/components/Client.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/components/Client.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/criteria/components/Client.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/components/Client.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/criteria/components/ComponentCriteriaTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/components/ComponentCriteriaTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/criteria/components/ComponentCriteriaTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/components/ComponentCriteriaTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/criteria/components/Name.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/components/Name.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/criteria/components/Name.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/components/Name.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/criteria/paths/ImplicitJoinTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/paths/ImplicitJoinTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/criteria/paths/ImplicitJoinTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/paths/ImplicitJoinTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/criteria/subquery/CorrelatedSubqueryTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/subquery/CorrelatedSubqueryTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/criteria/subquery/CorrelatedSubqueryTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/subquery/CorrelatedSubqueryTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/criteria/subquery/UncorrelatedSubqueryTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/subquery/UncorrelatedSubqueryTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/criteria/subquery/UncorrelatedSubqueryTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/subquery/UncorrelatedSubqueryTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/criteria/tuple/TupleCriteriaTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/tuple/TupleCriteriaTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/criteria/tuple/TupleCriteriaTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/tuple/TupleCriteriaTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/metamodel/AbstractMetamodelSpecificTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/AbstractMetamodelSpecificTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/metamodel/AbstractMetamodelSpecificTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/AbstractMetamodelSpecificTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/metamodel/Address.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Address.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/metamodel/Address.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Address.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/metamodel/Alias.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Alias.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/metamodel/Alias.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Alias.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/metamodel/Country.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Country.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/metamodel/Country.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Country.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/metamodel/CreditCard.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/CreditCard.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/metamodel/CreditCard.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/CreditCard.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/metamodel/Customer.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Customer.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/metamodel/Customer.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Customer.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/metamodel/EmbeddedTypeTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/EmbeddedTypeTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/metamodel/EmbeddedTypeTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/EmbeddedTypeTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/metamodel/Info.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Info.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/metamodel/Info.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Info.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/metamodel/LineItem.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/LineItem.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/metamodel/LineItem.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/LineItem.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/metamodel/Order.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Order.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/metamodel/Order.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Order.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/metamodel/Phone.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Phone.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/metamodel/Phone.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Phone.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/metamodel/Product.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Product.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/metamodel/Product.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Product.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/metamodel/ShelfLife.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/ShelfLife.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/metamodel/ShelfLife.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/ShelfLife.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/metamodel/Spouse.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Spouse.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/metamodel/Spouse.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Spouse.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/Cat.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/Cat.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/Cat.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/Cat.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/Distributor.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/Distributor.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/Distributor.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/Distributor.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/Item.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/Item.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/Item.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/Item.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/Kitten.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/Kitten.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/Kitten.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/Kitten.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/LastUpdateListener.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/LastUpdateListener.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/LastUpdateListener.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/LastUpdateListener.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/MyNamingStrategy.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/MyNamingStrategy.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/MyNamingStrategy.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/MyNamingStrategy.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/NoOpListener.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/NoOpListener.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/NoOpListener.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/NoOpListener.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/TestCase.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/TestCase.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/TestCase.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/TestCase.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/Wallet.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/Wallet.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/Wallet.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/Wallet.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/association/AssociationTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/association/AssociationTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/association/AssociationTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/association/AssociationTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/association/Incident.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/association/Incident.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/association/Incident.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/association/Incident.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/association/IncidentStatus.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/association/IncidentStatus.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/association/IncidentStatus.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/association/IncidentStatus.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/association/Kitchen.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/association/Kitchen.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/association/Kitchen.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/association/Kitchen.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/association/Oven.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/association/Oven.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/association/Oven.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/association/Oven.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/beanvalidation/BeanValidationTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/beanvalidation/BeanValidationTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/beanvalidation/BeanValidationTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/beanvalidation/BeanValidationTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/beanvalidation/CupHolder.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/beanvalidation/CupHolder.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/beanvalidation/CupHolder.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/beanvalidation/CupHolder.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/annotation/ConfigurationTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/annotation/ConfigurationTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/annotation/ConfigurationTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/annotation/ConfigurationTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/annotation/ExplicitlyCacheableEntity.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/annotation/ExplicitlyCacheableEntity.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/annotation/ExplicitlyCacheableEntity.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/annotation/ExplicitlyCacheableEntity.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/annotation/ExplicitlyNonCacheableEntity.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/annotation/ExplicitlyNonCacheableEntity.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/annotation/ExplicitlyNonCacheableEntity.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/annotation/ExplicitlyNonCacheableEntity.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/annotation/NoCacheableAnnotationEntity.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/annotation/NoCacheableAnnotationEntity.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/annotation/NoCacheableAnnotationEntity.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/annotation/NoCacheableAnnotationEntity.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/cachemodes/SharedCacheModesTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/cachemodes/SharedCacheModesTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/cachemodes/SharedCacheModesTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/cachemodes/SharedCacheModesTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/cachemodes/SimpleEntity.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/cachemodes/SimpleEntity.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/cachemodes/SimpleEntity.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/cachemodes/SimpleEntity.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CallbacksTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CallbacksTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CallbacksTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CallbacksTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CommunicationSystem.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CommunicationSystem.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CommunicationSystem.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CommunicationSystem.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CountryChecker.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CountryChecker.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CountryChecker.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CountryChecker.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CountryNameCheckerListener.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CountryNameCheckerListener.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CountryNameCheckerListener.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CountryNameCheckerListener.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Customer.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Customer.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Customer.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Customer.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Employee.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Employee.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Employee.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Employee.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/ExceptionListener.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/ExceptionListener.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/ExceptionListener.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/ExceptionListener.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/FirstOneListener.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/FirstOneListener.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/FirstOneListener.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/FirstOneListener.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/IncreaseListener.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/IncreaseListener.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/IncreaseListener.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/IncreaseListener.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Person.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Person.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Person.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Person.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Plant.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Plant.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Plant.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Plant.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/RemoteControl.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/RemoteControl.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/RemoteControl.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/RemoteControl.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Rythm.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Rythm.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Rythm.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Rythm.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Television.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Television.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Television.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Television.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Translation.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Translation.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Translation.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Translation.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/VideoSystem.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/VideoSystem.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/VideoSystem.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/VideoSystem.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Author.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Author.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Author.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Author.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/CascadeTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/CascadeTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cascade/CascadeTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/CascadeTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Conference.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Conference.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Conference.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Conference.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/DetachAndContainsTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/DetachAndContainsTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cascade/DetachAndContainsTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/DetachAndContainsTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocument.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocument.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocument.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocument.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocumentInfo.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocumentInfo.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocumentInfo.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocumentInfo.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/FetchTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/FetchTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cascade/FetchTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/FetchTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/FetchTest2.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/FetchTest2.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cascade/FetchTest2.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/FetchTest2.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Grandson.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Grandson.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Grandson.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Grandson.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Parent.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Parent.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Parent.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Parent.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Soldier.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Soldier.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Soldier.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Soldier.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Soldier2.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Soldier2.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Soldier2.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Soldier2.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Son.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Son.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Son.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Son.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Song.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Song.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Song.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Song.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Student.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Student.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Student.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Student.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Teacher.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Teacher.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Teacher.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Teacher.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Troop.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Troop.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Troop.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Troop.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Troop2.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Troop2.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Troop2.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Troop2.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/connection/FakeDataSource.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/connection/FakeDataSource.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/connection/FakeDataSource.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/connection/FakeDataSource.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/connection/FakeDataSourceException.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/connection/FakeDataSourceException.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/connection/FakeDataSourceException.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/connection/FakeDataSourceException.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ConfigurationObjectSettingTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ConfigurationObjectSettingTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ConfigurationObjectSettingTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ConfigurationObjectSettingTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/EntityManagerSerializationTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/EntityManagerSerializationTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/EntityManagerSerializationTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/EntityManagerSerializationTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/InterceptorTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/InterceptorTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/InterceptorTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/InterceptorTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/PersistenceUnitInfoAdapter.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/PersistenceUnitInfoAdapter.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/PersistenceUnitInfoAdapter.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/PersistenceUnitInfoAdapter.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Cat.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Cat.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/Cat.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Cat.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Colony.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Colony.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/Colony.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Colony.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Competition.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Competition.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/Competition.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Competition.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Competitor.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Competitor.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/Competitor.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Competitor.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Decorate.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Decorate.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/Decorate.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Decorate.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Dog.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Dog.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/Dog.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Dog.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Dress.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Dress.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/Dress.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Dress.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Empire.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Empire.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/Empire.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Empire.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushModeTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushModeTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushModeTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushModeTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/GetReferenceTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/GetReferenceTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/GetReferenceTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/GetReferenceTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Mail.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Mail.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/Mail.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Mail.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/MergeTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/MergeTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/MergeTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/MergeTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Music.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Music.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/Music.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Music.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Pet.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Pet.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/Pet.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Pet.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Race.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Race.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/Race.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/Race.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/RefreshTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/RefreshTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/RefreshTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/RefreshTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/RemoveTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/RemoveTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/RemoveTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/RemoveTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/A.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/A.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/A.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/A.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B1.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B1.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B1.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B1.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B2.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B2.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B2.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B2.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B3.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B3.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B3.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B3.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B4.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B4.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B4.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B4.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/C1.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/C1.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/C1.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/C1.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/C2.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/C2.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/C2.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/C2.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/exception/ExceptionTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/exception/ExceptionTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/exception/ExceptionTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/exception/ExceptionTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Instrument.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/exception/Instrument.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/exception/Instrument.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/exception/Instrument.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Music.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/exception/Music.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/exception/Music.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/exception/Music.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Musician.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/exception/Musician.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/exception/Musician.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/exception/Musician.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/Fruit.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/Fruit.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/Fruit.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/Fruit.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/InheritanceTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/InheritanceTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/InheritanceTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/InheritanceTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/Strawberry.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/Strawberry.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/Strawberry.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/Strawberry.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InstrumentedClassLoader.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InstrumentedClassLoader.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InstrumentedClassLoader.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InstrumentedClassLoader.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InterceptFieldClassFileTransformerTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InterceptFieldClassFileTransformerTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InterceptFieldClassFileTransformerTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InterceptFieldClassFileTransformerTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/instrument/Simple.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/Simple.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/instrument/Simple.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/Simple.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/jee/OrmVersionTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/jee/OrmVersionTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/jee/OrmVersionTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/jee/OrmVersionTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/lob/BlobTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/lob/BlobTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/lob/BlobTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/lob/BlobTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/lob/ImageReader.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/lob/ImageReader.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/lob/ImageReader.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/lob/ImageReader.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/lock/Lock.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/lock/Lock.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/lock/Lock.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/lock/Lock.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java similarity index 99% rename from entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java index fe5d698eb0a3..8f12986e521f 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java @@ -8,8 +8,6 @@ import javax.persistence.Query; import javax.persistence.QueryTimeoutException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.hibernate.dialect.HSQLDialect; import org.hibernate.dialect.Oracle10gDialect; import org.hibernate.ejb.AvailableSettings; @@ -23,11 +21,14 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @author Emmanuel Bernard */ public class LockTest extends TestCase { - private static final Log log = LogFactory.getLog( LockTest.class ); + private static final Logger log = LoggerFactory.getLogger( LockTest.class ); public void testFindWithTimeoutHint() { EntityManager em = getOrCreateEntityManager(); diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/lock/Lockable.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/lock/Lockable.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/lock/Lockable.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/lock/Lockable.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/lock/QueryLockingTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/lock/QueryLockingTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/lock/QueryLockingTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/lock/QueryLockingTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/lock/UnversionedLock.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/lock/UnversionedLock.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/lock/UnversionedLock.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/lock/UnversionedLock.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/mapping/Phone.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/mapping/Phone.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/mapping/Phone.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/mapping/Phone.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/mapping/QuotingTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/mapping/QuotingTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/mapping/QuotingTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/mapping/QuotingTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Address.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Address.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Address.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Address.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Animal.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Animal.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Animal.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Animal.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Being.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Being.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Being.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Being.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Cat.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Cat.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Cat.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Cat.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Cattish.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Cattish.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Cattish.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Cattish.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Child.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Child.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Child.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Child.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/DeskWithRawType.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/DeskWithRawType.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/DeskWithRawType.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/DeskWithRawType.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Dog.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Dog.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Dog.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Dog.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/EmployeeWithRawType.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/EmployeeWithRawType.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/EmployeeWithRawType.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/EmployeeWithRawType.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Feline.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Feline.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Feline.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Feline.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Flower.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Flower.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Flower.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Flower.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/FoodItem.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/FoodItem.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/FoodItem.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/FoodItem.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Fridge.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Fridge.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Fridge.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Fridge.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Garden.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Garden.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Garden.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Garden.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/House.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/House.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/House.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/House.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/JoinedManyToOneOwner.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/JoinedManyToOneOwner.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/JoinedManyToOneOwner.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/JoinedManyToOneOwner.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/MetadataTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/MetadataTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/MetadataTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/MetadataTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Parent.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Parent.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Parent.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Parent.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Person.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Person.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Person.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Person.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Room.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Room.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Room.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Room.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/SecondMetadataTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/SecondMetadataTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/SecondMetadataTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/SecondMetadataTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/SimpleMedicalHistory.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/SimpleMedicalHistory.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/SimpleMedicalHistory.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/SimpleMedicalHistory.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/SimplePerson.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/SimplePerson.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/SimplePerson.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/SimplePerson.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/StaticMetadataTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/StaticMetadataTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/StaticMetadataTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/StaticMetadataTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/SubThing.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/SubThing.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/SubThing.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/SubThing.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Thing.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Thing.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Thing.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/Thing.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/WithGenericCollection.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/WithGenericCollection.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/metadata/WithGenericCollection.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/WithGenericCollection.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Animal.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/Animal.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ops/Animal.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/Animal.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employee.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employee.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employee.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employee.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employer.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employer.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employer.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employer.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/FindTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/FindTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ops/FindTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/FindTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/GetLoadTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/GetLoadTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ops/GetLoadTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/GetLoadTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Mammal.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/Mammal.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ops/Mammal.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/Mammal.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/MergeNewTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/MergeNewTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ops/MergeNewTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/MergeNewTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/MergeTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/MergeTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ops/MergeTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/MergeTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Node.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/Node.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ops/Node.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/Node.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/NumberedNode.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/NumberedNode.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ops/NumberedNode.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/NumberedNode.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Reptile.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/Reptile.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ops/Reptile.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/Reptile.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Workload.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/Workload.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/ops/Workload.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ops/Workload.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/cfgxmlpar/Morito.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/cfgxmlpar/Morito.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/cfgxmlpar/Morito.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/cfgxmlpar/Morito.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/ApplicationServer.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/ApplicationServer.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/ApplicationServer.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/ApplicationServer.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/IncrementListener.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/IncrementListener.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/IncrementListener.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/IncrementListener.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Lighter.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Lighter.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Lighter.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Lighter.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Money.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Money.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Money.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Money.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Mouse.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Mouse.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Mouse.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Mouse.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/OtherIncrementListener.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/OtherIncrementListener.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/OtherIncrementListener.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/OtherIncrementListener.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Version.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Version.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Version.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Version.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/package-info.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/package-info.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/package-info.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/package-info.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/ApplicationServer1.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/ApplicationServer1.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/ApplicationServer1.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/ApplicationServer1.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/IncrementListener1.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/IncrementListener1.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/IncrementListener1.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/IncrementListener1.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/Lighter1.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/Lighter1.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/Lighter1.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/Lighter1.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/Money1.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/Money1.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/Money1.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/Money1.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/Mouse1.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/Mouse1.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/Mouse1.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/Mouse1.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/OtherIncrementListener1.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/OtherIncrementListener1.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/OtherIncrementListener1.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/OtherIncrementListener1.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/Version1.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/Version1.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/Version1.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/Version1.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/package-info.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/package-info.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/package-info.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar_1_0/package-info.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/excludehbmpar/Caipirinha.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/excludehbmpar/Caipirinha.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/excludehbmpar/Caipirinha.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/excludehbmpar/Caipirinha.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/explicitpar/Washer.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/explicitpar/Washer.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/explicitpar/Washer.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/explicitpar/Washer.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/explodedpar/Carpet.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/explodedpar/Carpet.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/explodedpar/Carpet.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/explodedpar/Carpet.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/explodedpar/Elephant.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/explodedpar/Elephant.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/explodedpar/Elephant.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/explodedpar/Elephant.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/explodedpar/package-info.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/explodedpar/package-info.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/explodedpar/package-info.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/explodedpar/package-info.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/externaljar/Scooter.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/externaljar/Scooter.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/externaljar/Scooter.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/externaljar/Scooter.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/various/Airplane.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/various/Airplane.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/various/Airplane.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/various/Airplane.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/various/Seat.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/various/Seat.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/various/Seat.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/various/Seat.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/ApplicationServer.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/ApplicationServer.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/ApplicationServer.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/ApplicationServer.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/IncrementListener.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/IncrementListener.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/IncrementListener.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/IncrementListener.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Lighter.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Lighter.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Lighter.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Lighter.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Money.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Money.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Money.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Money.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Mouse.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Mouse.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Mouse.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Mouse.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/OtherIncrementListener.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/OtherIncrementListener.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/OtherIncrementListener.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/OtherIncrementListener.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Version.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Version.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Version.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Version.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/package-info.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/package-info.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/package-info.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/package-info.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/CustomScanner.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/CustomScanner.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/packaging/CustomScanner.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/CustomScanner.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagedEntityManagerTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagedEntityManagerTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagedEntityManagerTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagedEntityManagerTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagingTestCase.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagingTestCase.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagingTestCase.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagingTestCase.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/Pasta.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/Pasta.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/packaging/Pasta.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/Pasta.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/ScannerTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/ScannerTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/packaging/ScannerTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/ScannerTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/query/ComponentJoinsTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/query/ComponentJoinsTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/query/ComponentJoinsTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/query/ComponentJoinsTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/query/QueryTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/query/QueryTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/query/QueryTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/query/QueryTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/transaction/Book.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/transaction/Book.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/transaction/Book.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/transaction/Book.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/util/Author.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/util/Author.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/util/Author.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/util/Author.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/util/Book.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/util/Book.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/util/Book.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/util/Book.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/util/CopyrightableContent.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/util/CopyrightableContent.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/util/CopyrightableContent.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/util/CopyrightableContent.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/util/GetIdentifierTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/util/GetIdentifierTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/util/GetIdentifierTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/util/GetIdentifierTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/util/IsLoadedTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/util/IsLoadedTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/util/IsLoadedTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/util/IsLoadedTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/util/PersistenceUtilHelperTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/util/PersistenceUtilHelperTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/util/PersistenceUtilHelperTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/util/PersistenceUtilHelperTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/util/Sickness.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/util/Sickness.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/util/Sickness.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/util/Sickness.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/util/Umbrella.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/util/Umbrella.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/util/Umbrella.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/util/Umbrella.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Address.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/Address.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/Address.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/Address.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Article.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/Article.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/Article.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/Article.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/CounterListener.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/CounterListener.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/CounterListener.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/CounterListener.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Employee.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/Employee.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/Employee.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/Employee.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Light.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/Light.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/Light.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/Light.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Lighter.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/Lighter.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/Lighter.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/Lighter.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/XmlTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/XmlTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/XmlTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/XmlTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/Address.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/Address.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/Address.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/Address.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/Article.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/Article.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/Article.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/Article.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/Employee.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/Employee.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/Employee.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/Employee.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/Light.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/Light.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/Light.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/Light.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/Lighter.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/Lighter.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/Lighter.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/Lighter.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/XmlAttributeOverrideTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/XmlAttributeOverrideTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/XmlAttributeOverrideTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/XmlAttributeOverrideTest.java diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/XmlTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/XmlTest.java similarity index 100% rename from entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/XmlTest.java rename to hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/sequences/XmlTest.java diff --git a/entitymanager/src/test/resources/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml b/hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml similarity index 100% rename from entitymanager/src/test/resources/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml rename to hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml diff --git a/entitymanager/src/test/resources/org/hibernate/ejb/test/hibernate.cfg.xml b/hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/hibernate.cfg.xml similarity index 100% rename from entitymanager/src/test/resources/org/hibernate/ejb/test/hibernate.cfg.xml rename to hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/hibernate.cfg.xml diff --git a/entitymanager/src/test/resources/org/hibernate/ejb/test/jee/invalid-orm-1.xml b/hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/jee/invalid-orm-1.xml similarity index 100% rename from entitymanager/src/test/resources/org/hibernate/ejb/test/jee/invalid-orm-1.xml rename to hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/jee/invalid-orm-1.xml diff --git a/entitymanager/src/test/resources/org/hibernate/ejb/test/jee/valid-orm-1.xml b/hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/jee/valid-orm-1.xml similarity index 100% rename from entitymanager/src/test/resources/org/hibernate/ejb/test/jee/valid-orm-1.xml rename to hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/jee/valid-orm-1.xml diff --git a/entitymanager/src/test/resources/org/hibernate/ejb/test/jee/valid-orm-2.xml b/hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/jee/valid-orm-2.xml similarity index 100% rename from entitymanager/src/test/resources/org/hibernate/ejb/test/jee/valid-orm-2.xml rename to hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/jee/valid-orm-2.xml diff --git a/entitymanager/src/test/resources/org/hibernate/ejb/test/mapping/orm.xml b/hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/mapping/orm.xml similarity index 100% rename from entitymanager/src/test/resources/org/hibernate/ejb/test/mapping/orm.xml rename to hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/mapping/orm.xml diff --git a/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Employer.hbm.xml b/hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Employer.hbm.xml similarity index 100% rename from entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Employer.hbm.xml rename to hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Employer.hbm.xml diff --git a/entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Node.hbm.xml b/hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Node.hbm.xml similarity index 100% rename from entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Node.hbm.xml rename to hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/ops/Node.hbm.xml diff --git a/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm.xml b/hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm.xml similarity index 100% rename from entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm.xml rename to hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm.xml diff --git a/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm2.xml b/hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm2.xml similarity index 100% rename from entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm2.xml rename to hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm2.xml diff --git a/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm3.xml b/hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm3.xml similarity index 100% rename from entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm3.xml rename to hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/xml/orm3.xml diff --git a/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm.xml b/hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm.xml similarity index 100% rename from entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm.xml rename to hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm.xml diff --git a/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm2.xml b/hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm2.xml similarity index 100% rename from entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm2.xml rename to hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm2.xml diff --git a/entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm3.xml b/hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm3.xml similarity index 100% rename from entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm3.xml rename to hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/xml/sequences/orm3.xml diff --git a/settings.gradle b/settings.gradle index 66809454fa45..a4c818e98094 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,5 @@ include 'hibernate-core' +include 'hibernate-entitymanager' rootProject.children.each { project ->