From 1a24c9315539071aabf419ec1d6f4da14b48efa1 Mon Sep 17 00:00:00 2001 From: Christian Beikov Date: Wed, 5 May 2021 12:11:45 +0200 Subject: [PATCH] Move tests from packages actionqueue, annotations, batch, boot, bytecode, id, resource, schemafilter, schematools, schemaupdate, schemavalidation, serialization, service, tool, unidir, util --- .../AbstractMultiTenancyTest.java | 2 +- .../DatabaseTimeZoneMultiTenancyTest.java | 2 +- .../org/hibernate/dialect/DerbyDialect.java | 5 + .../bytebuddy/EnhancerWildFlyNamesTest.java | 2 - ...stractCriteriaLiteralHandlingModeTest.java | 4 - ...tementIsClosedAfterALockExceptionTest.java | 4 +- .../jpa/test/query/NamedQueryCommentTest.java | 1 - .../CustomAfterCompletionTest.java | 2 +- .../CustomBeforeCompletionTest.java | 2 +- .../{ => orm}/test/annotations/.gitignore | 0 .../{ => orm}/test/annotations/Company.java | 2 +- .../annotations/CreationTimestampTest.java | 2 +- .../test/annotations/EntityTest.java | 2 +- .../{ => orm}/test/annotations/Flight.java | 2 +- ...ryCreationTimestampNullableColumnTest.java | 2 +- .../InMemoryUpdateTimestampTest.java | 2 +- .../test/annotations/JoinedSubclassTest.java | 7 +- .../test/annotations/SafeMappingTest.java | 4 +- .../test/annotations/SecuredBindingTest.java | 3 +- .../{ => orm}/test/annotations/Sky.java | 2 +- .../UpdateTimeStampInheritanceTest.java | 2 +- .../test/annotations/UpdateTimestampTest.java | 2 +- .../annotations/beanvalidation/Address.java | 2 +- .../BeanValidationAutoTest.java | 2 +- .../BeanValidationDisabledTest.java | 2 +- .../BeanValidationGroupsTest.java | 2 +- .../BeanValidationProvidedFactoryTest.java | 2 +- .../annotations/beanvalidation/Button.java | 2 +- .../annotations/beanvalidation/Color.java | 2 +- .../annotations/beanvalidation/CupHolder.java | 2 +- .../annotations/beanvalidation/DDLTest.java | 2 +- .../DDLWithoutCallbackTest.java | 4 +- .../annotations/beanvalidation/Display.java | 2 +- .../beanvalidation/DisplayConnector.java | 2 +- .../HibernateTraversableResolverTest.java | 3 +- .../MergeNotNullCollectionTest.java | 2 +- ...rgeNotNullCollectionUsingIdentityTest.java | 2 +- .../annotations/beanvalidation/MinMax.java | 2 +- .../annotations/beanvalidation/Music.java | 2 +- .../beanvalidation/PowerSupply.java | 2 +- .../test/annotations/beanvalidation/Rock.java | 2 +- .../annotations/beanvalidation/Screen.java | 2 +- .../annotations/beanvalidation/Strict.java | 2 +- .../test/annotations/beanvalidation/Tv.java | 142 +++++++++--------- .../annotations/beanvalidation/TvOwner.java | 2 +- .../test/annotations/bytecode/Hammer.java | 2 +- .../bytecode/ProxyBreakingTest.java | 4 +- .../test/annotations/bytecode/Tool.java | 2 +- .../configuration/ConfigurationTest.java | 6 +- .../configuration/package-info.java | 2 +- .../derivedidentities/e1/b/Dependent.java | 2 +- .../derivedidentities/e1/b/DependentId.java | 2 +- ...IdentitySimpleParentEmbeddedIdDepTest.java | 4 +- .../derivedidentities/e1/b}/Employee.java | 2 +- .../e1/b/ExclusiveDependent.java | 2 +- .../e1/b/specjmapid/Customer.java | 2 +- .../e1/b/specjmapid/CustomerInventory.java | 2 +- .../e1/b/specjmapid/CustomerInventoryPK.java | 2 +- .../b/specjmapid/IdMapManyToOneSpecjTest.java | 2 +- .../e1/b/specjmapid/Item.java | 2 +- .../lazy/CompositeKeyDeleteTest.java | 10 +- .../specjmapid/lazy/CustomerInventoryTwo.java | 4 +- .../lazy/CustomerInventoryTwoPK.java | 2 +- .../e1/b/specjmapid/lazy/CustomerTwo.java | 4 +- .../e1/b/specjmapid/lazy/hbm_order.xml | 4 +- .../e1/b/specjmapid/lazy/order_orm.xml | 78 +++++----- .../derivedidentities/e1/c/Dependent.java | 2 +- ...edIdentitySimpleParentEmbeddedDepTest.java | 4 +- .../derivedidentities/e1/c}/Employee.java | 2 +- ...entitySimpleParentSimpleDepMapsIdTest.java | 4 +- .../e4/b/FinancialHistory.java | 2 +- .../e4/b/MedicalHistory.java | 2 +- .../derivedidentities/e4/b/Person.java | 2 +- .../e5/c/ForeignGeneratorViaMapsIdTest.java | 4 +- .../e5/c/MedicalHistory.java | 2 +- .../derivedidentities/e5/c/Person.java | 2 +- .../duplicatedgenerator/DuplicateTest.java | 12 +- .../duplicatedgenerator/Flight.java | 2 +- .../test/annotations/entity/Address.java | 2 +- .../entity/BasicHibernateAnnotationsTest.java | 9 +- .../test/annotations/entity/Bid.java | 2 +- .../test/annotations/entity/Car.java | 2 +- .../annotations/entity/CasterStringType.java | 2 +- .../test/annotations/entity/CommunityBid.java | 2 +- .../annotations/entity/ContactDetails.java | 2 +- .../test/annotations/entity/Country.java | 2 +- .../test/annotations/entity/Doctor.java | 2 +- .../test/annotations/entity/Drill.java | 2 +- .../test/annotations/entity/FirstName.java | 2 +- .../test/annotations/entity/Flight.java | 2 +- .../test/annotations/entity/Forest.java | 2 +- .../test/annotations/entity/Forest2.java | 2 +- .../annotations/entity/FormalLastName.java | 2 +- .../HibernateAnnotationMappingTest.java | 4 +- .../annotations/entity/Java5FeaturesTest.java | 2 +- .../test/annotations/entity/LastName.java | 2 +- .../test/annotations/entity/Length.java | 2 +- .../entity/LocalContactDetails.java | 2 +- .../annotations/entity/MonetaryAmount.java | 2 +- .../test/annotations/entity/Month.java | 2 +- .../test/annotations/entity/Name.java | 2 +- .../test/annotations/entity/Narrative.java | 2 +- ...NewCustomEntityMappingAnnotationsTest.java | 2 +- .../entity/OverseasPhoneNumber.java | 2 +- .../test/annotations/entity/Peugot.java | 2 +- .../test/annotations/entity/PhoneNumber.java | 2 +- .../annotations/entity/PhoneNumberType.java | 2 +- .../test/annotations/entity/Player.java | 2 +- .../test/annotations/entity/PowerDrill.java | 2 +- .../entity/PropertyDefaultMappingsTest.java | 2 +- .../test/annotations/entity/Race.java | 2 +- .../test/annotations/entity/Ransom.java | 2 +- .../test/annotations/entity/SoccerTeam.java | 2 +- .../test/annotations/entity/Starred.java | 2 +- .../test/annotations/entity/Tool.java | 2 +- .../test/annotations/entity/Topic.java | 2 +- .../test/annotations/entity/Tree.java | 2 +- .../annotations/entity/WashingMachine.java | 2 +- .../test/annotations/entity/Widget.java | 2 +- .../test/annotations/entity/ZipCode.java | 2 +- .../test/annotations/entity/package-info.java | 2 +- .../annotations/entitynonentity/Cellular.java | 2 +- .../entitynonentity/Communication.java | 2 +- .../entitynonentity/EntityNonEntityTest.java | 2 +- .../test/annotations/entitynonentity/GSM.java | 2 +- .../entitynonentity/Interaction.java | 2 +- .../annotations/entitynonentity/Phone.java | 2 +- .../annotations/entitynonentity/Voice.java | 2 +- .../mapkey/MapKeyEnumeratedTest.java | 2 +- .../enumerated/mapkey/SocialNetwork.java | 2 +- .../mapkey/SocialNetworkProfile.java | 2 +- .../annotations/enumerated/mapkey/User.java | 2 +- .../EnumeratedWithMappedSuperclassTest.java | 2 +- .../enumerated/ormXml/Binding.java | 2 +- .../enumerated/ormXml/BookWithOrmEnum.java | 2 +- .../enumerated/ormXml/OrmXmlEnumTypeTest.java | 4 +- .../annotations/fetchprofile/Country.java | 2 +- .../annotations/fetchprofile/Customer.java | 2 +- .../annotations/fetchprofile/Customer2.java | 2 +- .../annotations/fetchprofile/Customer3.java | 2 +- .../annotations/fetchprofile/Customer4.java | 2 +- .../annotations/fetchprofile/Customer5.java | 2 +- .../annotations/fetchprofile/Customer6.java | 4 +- .../fetchprofile/FetchProfileTest.java | 6 +- .../MappedByFetchProfileFunctionTest.java | 5 +- .../MappedByFetchProfileUnitTest.java | 5 +- .../fetchprofile/MoreFetchProfileTest.java | 2 +- .../test/annotations/fetchprofile/Order.java | 2 +- .../fetchprofile/SupportTickets.java | 2 +- .../fetchprofile/mappedby/Address.java | 4 +- .../fetchprofile/mappedby/package-info.java | 4 +- .../fetchprofile/package-info.java | 2 +- .../orm/test/annotations/id/IdTest.java | 2 +- .../test/annotations/id/sequences/IdTest.java | 2 +- .../index/jpa/AbstractJPAIndexTest.java | 2 +- .../test/annotations/index/jpa/Car.java | 2 +- .../test/annotations/index/jpa/Dealer.java | 2 +- .../test/annotations/index/jpa/Importer.java | 2 +- .../test/annotations/index/jpa/IndexTest.java | 2 +- .../index/jpa/OrmXmlIndexTest.java | 4 +- .../indexcoll/eager/Atmosphere.java | 2 +- .../eager/EagerIndexedCollectionTest.java | 2 +- .../{ => orm}/test/annotations/join/A.java | 2 +- .../{ => orm}/test/annotations/join/B.java | 2 +- .../{ => orm}/test/annotations/join/C.java | 2 +- .../{ => orm}/test/annotations/join/Cat.java | 2 +- .../test/annotations/join/Death.java | 2 +- .../{ => orm}/test/annotations/join/Dog.java | 2 +- .../test/annotations/join/DogPk.java | 2 +- .../test/annotations/join/JoinTest.java | 2 +- .../{ => orm}/test/annotations/join/Life.java | 2 +- .../test/annotations/join/SysGroupsOrm.java | 2 +- .../test/annotations/join/SysUserOrm.java | 98 ++++++------ .../annotations/join/namingstrategy/Life.java | 2 +- .../NamingStrategyJoinTest.java | 2 +- .../join/namingstrategy/SimpleCat.java | 2 +- .../namingstrategy/TestNamingStrategy.java | 2 +- .../annotations/lob/locator/LobHolder.java | 2 +- .../lob/locator/LobLocatorTest.java | 2 +- .../manytomany/defaults/Category.java | 2 +- .../annotations/manytomany/defaults/City.java | 2 +- .../manytomany/defaults/ContactInfo.java | 2 +- .../manytomany/defaults/Employee.java | 7 +- .../annotations/manytomany/defaults/Item.java | 2 +- ...CompliantManyToManyImplicitNamingTest.java | 2 +- .../manytomany/defaults/KnownClient.java | 2 +- .../ManyToManyImplicitNamingTest.java | 2 +- .../manytomany/defaults/PhoneNumber.java | 2 +- .../manytomany/defaults/Store.java | 4 +- .../manytoone/NotNullManyToOneTest.java | 2 +- .../test/annotations/namingstrategy/A.java | 2 +- .../annotations/namingstrategy/Address.java | 2 +- .../namingstrategy/AddressEntry.java | 2 +- .../namingstrategy/DummyNamingStrategy.java | 2 +- .../LongIdentifierNamingStrategy.java | 2 +- .../LongKeyNamingStrategyTest.java | 4 +- .../namingstrategy/NamingStrategyTest.java | 4 +- .../annotations/namingstrategy/Person.java | 2 +- .../AbstractCharsetNamingStrategyTest.java | 4 +- .../Iso88591CharsetNamingStrategyTest.java | 2 +- .../Utf8CharsetNamingStrategyTest.java | 2 +- .../onetoone/hhh4851/BaseEntity.java | 2 +- .../annotations/onetoone/hhh4851/Device.java | 2 +- .../onetoone/hhh4851/DeviceGroupConfig.java | 2 +- .../onetoone/hhh4851/HHH4851Test.java | 2 +- .../onetoone/hhh4851/Hardware.java | 2 +- .../onetoone/hhh4851/ManagedDevice.java | 2 +- .../annotations/onetoone/hhh4851/Owner.java | 2 +- .../test/annotations/persister/Card.java | 2 +- .../persister/CollectionPersister.java | 2 +- .../test/annotations/persister/Deck.java | 6 +- .../persister/EntityPersister.java | 2 +- .../annotations/persister/PersisterTest.java | 2 +- .../ExplicitSqlResultSetMappingTest.java | 2 +- .../quote/resultsetmappings/MyEntity.java | 2 +- .../reflection/Administration.java | 2 +- .../annotations/reflection/Availability.java | 2 +- .../test/annotations/reflection/BusTrip.java | 2 +- .../annotations/reflection/BusTripPk.java | 2 +- .../test/annotations/reflection/Company.java | 2 +- .../annotations/reflection/Competition.java | 2 +- .../ElementCollectionConverterTest.java | 4 +- .../JPAXMLOverriddenAnnotationReaderTest.java | 26 ++-- .../annotations/reflection/LogListener.java | 2 +- .../test/annotations/reflection/Match.java | 2 +- .../annotations/reflection/Organization.java | 2 +- .../reflection/OrganizationConverter.java | 2 +- .../reflection/OtherLogListener.java | 2 +- .../SocialSecurityMoralAccount.java | 2 +- .../reflection/SocialSecurityNumber.java | 2 +- .../SocialSecurityPhysicalAccount.java | 2 +- .../annotations/reflection/TennisMatch.java | 2 +- .../reflection/XMLContextTest.java | 5 +- .../SecondaryTableSchemaTest.java | 2 +- .../UpdateDetachedTest.java | 2 +- .../test/annotations/strategy/Location.java | 2 +- .../test/annotations/strategy/Storm.java | 2 +- .../annotations/strategy/StrategyTest.java | 2 +- .../test/annotations/subselect/Bid.java | 2 +- .../annotations/subselect/HighestBid.java | 2 +- .../test/annotations/subselect/Item.java | 2 +- .../annotations/subselect/SubselectTest.java | 2 +- .../test/annotations/target/Brand.java | 2 +- .../test/annotations/target/Luggage.java | 2 +- .../test/annotations/target/LuggageImpl.java | 2 +- .../test/annotations/target/Owner.java | 2 +- .../test/annotations/target/OwnerImpl.java | 2 +- .../test/annotations/target/Size.java | 2 +- .../test/annotations/target/SizeImpl.java | 2 +- .../test/annotations/target/TargetTest.java | 2 +- .../UniqueConstraintTest.java | 5 +- ...hrowsConstraintViolationExceptionTest.java | 4 +- .../UniqueConstraintUnitTests.java | 2 +- .../UniqueConstraintValidationTest.java | 2 +- .../test/annotations/various/IndexTest.java | 6 +- .../various/OptimisticLockAnnotationTest.java | 4 +- .../test/annotations/xml/ejb3/CarModel.java | 2 +- .../test/annotations/xml/ejb3/Company.java | 2 +- .../ejb3/Ejb3XmlElementCollectionTest.java | 2 +- .../xml/ejb3/Ejb3XmlManyToManyTest.java | 2 +- .../xml/ejb3/Ejb3XmlManyToOneTest.java | 2 +- .../xml/ejb3/Ejb3XmlOneToManyTest.java | 2 +- .../xml/ejb3/Ejb3XmlOneToOneTest.java | 2 +- .../annotations/xml/ejb3/Ejb3XmlTest.java | 12 +- .../annotations/xml/ejb3/Ejb3XmlTestCase.java | 2 +- .../test/annotations/xml/ejb3/Entity1.java | 2 +- .../test/annotations/xml/ejb3/Entity2.java | 2 +- .../test/annotations/xml/ejb3/Entity3.java | 2 +- .../test/annotations/xml/ejb3/Light.java | 2 +- .../test/annotations/xml/ejb3/Lighter.java | 2 +- .../annotations/xml/ejb3/Manufacturer.java | 2 +- .../test/annotations/xml/ejb3/Model.java | 2 +- .../xml/ejb3/NonExistentOrmVersionTest.java | 4 +- .../xml/ejb3/OrmVersion1SupportedTest.java | 4 +- .../xml/ejb3/PreParsedOrmXmlTest.java | 4 +- .../annotations/xml/ejb3/VicePresident.java | 2 +- .../batch/BatchOptimisticLockingTest.java | 2 +- .../{ => orm}/test/batch/BatchTest.java | 8 +- .../test/batch/BatchingBatchFailureTest.java | 2 +- .../batch/BatchingInheritanceDeleteTest.java | 2 +- .../{ => orm}/test/batch/DataPoint.hbm.xml | 2 +- .../{ => orm}/test/batch/DataPoint.java | 2 +- .../batch/NonBatchingBatchFailureTest.java | 2 +- .../OptionalSecondaryTableBatchTest.java | 2 +- .../test/boot/cfgXml/CfgXmlParsingTest.java | 6 +- .../cfgXml/CfgXmlResourceNameClosingTest.java | 5 +- .../test/boot/cfgXml/badnamespace.cfg.xml | 0 .../test/boot/cfgXml/hibernate.cfg.xml | 0 .../qualfiedTableNaming/NamespaceTest.java | 2 +- .../QualifiedTableNamingTest.java | 2 +- .../hbm/internal/EntityModeConverterTest.java | 2 +- .../GenerationTimingConverterTest.java | 2 +- .../jaxb/hbm/internal/XmlBindingChecker.java | 2 +- .../relational/QualifiedNameParserTest.java | 2 +- .../boot/model/source/AttributePathTest.java | 2 +- .../EmbeddedOverrideTests.java | 4 +- .../MappedSuperclassOverrideTests.java | 2 +- .../EmbeddedOverrideTests.java | 2 +- .../MappedSuperclassOverrideTests.java | 2 +- .../PluralEmbeddedOverrideTests.java | 2 +- .../TablePerClassOverrideTests.java | 2 +- .../annotations/embedded/EmbeddedTest.java | 2 +- .../AssociationOverrideSchemaTest.java | 2 +- .../override/AssociationOverrideTest.java | 2 +- .../override/AttributeOverrideTest.java | 2 +- .../schema/SchemaManagementScriptTests.java | 6 +- .../{ => orm}/test/bytecode/Bean.hbm.xml | 2 +- .../{ => orm}/test/bytecode/Bean.java | 2 +- .../test/bytecode/BeanReflectionHelper.java | 2 +- .../InvocationTargetExceptionTest.java | 8 +- .../{ => orm}/test/bytecode/ProxyBean.java | 2 +- .../bytecode/ReflectionOptimizerTest.java | 2 +- .../enhancement/access/MixedAccessTest.java | 2 +- .../InheritedAttributeAssociationTest.java | 2 +- .../ManyToManyAssociationTest.java | 2 +- .../association/OneToManyAssociationTest.java | 2 +- .../association/OneToOneAssociationTest.java | 2 +- .../basic/BasicEnhancementTest.java | 2 +- .../enhancement/basic/BasicSessionTest.java | 2 +- .../basic/CrossEnhancementTest.java | 2 +- .../ExtendedAssociationManagementTest.java | 2 +- ...nValueMappedSuperclassEnhancementTest.java | 2 +- .../enhancement/basic/InheritedTest.java | 2 +- .../basic/MappedSuperclassTest.java | 3 +- .../ObjectAttributeMarkerInterceptor.java | 2 +- .../detached/DetachedGetIdentifierTest.java | 4 +- ...kingCollectionInDefaultFetchGroupTest.java | 2 +- .../dirty/DirtyTrackingCollectionTest.java | 2 +- .../dirty/DirtyTrackingNonUpdateableTest.java | 2 +- .../dirty/DirtyTrackingPersistTest.java | 2 +- .../enhancement/dirty/DirtyTrackingTest.java | 2 +- .../enhancement/eviction/EvictionTest.java | 2 +- .../LazyBasicFieldNotInitializedTest.java | 4 +- .../lazy/LazyCollectionDeletedTest.java | 2 +- .../lazy/LazyCollectionDetachTest.java | 6 +- ...izationWithoutInlineDirtyTrackingTest.java | 2 +- .../lazy/LazyLoadingByEnhancerSetterTest.java | 2 +- ...OneToManyWithEqualsImplementationTest.java | 2 +- .../lazy/LazyProxyOnEnhancedEntityTest.java | 7 +- .../lazy/cache/LazyInCacheTest.java | 8 +- .../UninitializedAssociationsInCacheTest.java | 2 +- .../UninitializedLazyBasicCacheTest.java | 2 +- .../proxy/LoadANonExistingEntityTest.java | 2 +- .../MappedSuperclassWithEmbeddableTest.java | 2 +- .../lazy/proxy/ProxyDeletionTest.java | 11 +- .../lazy/proxy/SharingReferenceTest.java | 2 +- ...rtyCheckPrivateUnMappedCollectionTest.java | 3 +- .../LoadUninitializedCollectionTest.java | 4 +- ...QueryExecutionWithFlushModeAlwaysTest.java | 4 +- .../enhancement/merge/CompositeMergeTest.java | 4 +- .../test/bytecode/enhancement/merge/Leaf.java | 2 +- ...hedCascadedCollectionInEmbeddableTest.java | 2 +- ...NonCascadedCollectionInEmbeddableTest.java | 2 +- ...ergeEnhancedDetachedOrphanRemovalTest.java | 2 +- .../merge/MergeEnhancedEntityTest.java | 2 +- .../test/bytecode/enhancement/merge/Root.java | 2 +- .../mutable/MapStringConverter.java | 2 +- .../MutableTypeEnhancementTestCase.java | 2 +- .../enhancement/mutable/TestEntity.java | 2 +- .../OtherEntityEntryContextTest.java | 2 +- .../enhancement/pk/EmbeddedPKTest.java | 2 +- .../tracker/CompositeOwnerTrackerTest.java | 2 +- .../enhancement/tracker/DirtyTrackerTest.java | 2 +- .../orm/test/cfg/CfgFilePropertyTest.java | 2 +- .../connections/SuppliedConnectionTest.java | 2 +- .../id/idClass/IdClassNamingStrategyTest.java | 2 +- .../{ => orm}/test/id/idClass/MyEntity.java | 2 +- .../{ => orm}/test/id/idClass/MyEntityId.java | 2 +- .../BaseInsertOrderingTest.java | 2 +- .../jdbc/internal/AggressiveReleaseTest.java | 2 +- .../jdbc/internal/SessionJdbcBatchTest.java | 2 +- ...eDiscardPersistenceContextOnCloseTest.java | 9 +- ...eDiscardPersistenceContextOnCloseTest.java | 8 +- ...onnectionProviderSettingValueProvider.java | 2 +- .../common/DatabaseConnectionInfo.java | 2 +- .../common/SynchronizationCollectorImpl.java | 2 +- .../common/SynchronizationErrorImpl.java | 2 +- .../LegacySettingInitiatorTest.java | 2 +- ...chronizationRegistryStandardImplTests.java | 6 +- .../jdbc/AlreadyStartedTransactionTest.java | 2 +- .../jdbc/BasicJdbcTransactionTests.java | 11 +- .../jdbc/LogicalConnectionTestingImpl.java | 5 +- ...ransactionCoordinatorOwnerTestingImpl.java | 2 +- .../AbstractSkipAutoCommitTest.java | 4 +- .../jdbc/autocommit/H2SkipAutoCommitTest.java | 2 +- .../autocommit/MySQLSkipAutoCommitTest.java | 3 +- .../autocommit/OracleSkipAutoCommitTest.java | 2 +- .../PostgreSQLSkipAutoCommitTest.java | 2 +- .../SQLServerSkipAutoCommitTest.java | 2 +- .../jta/AbstractBasicJtaTestScenarios.java | 6 +- .../jta/BasicJtaTransactionManagerTests.java | 4 +- .../jta/BasicJtaUserTransactionTests.java | 4 +- .../jta/InaccessibleJtaPlatformTests.java | 2 +- ...mplianceAlreadyStartedTransactionTest.java | 2 +- .../jta/JtaPlatformInaccessibleImpl.java | 2 +- .../jta/JtaPlatformStandardTestingImpl.java | 2 +- ...mplianceAlreadyStartedTransactionTest.java | 2 +- ...ransactionCoordinatorOwnerTestingImpl.java | 2 +- .../test/schemafilter/CatalogFilterTest.java | 13 +- .../test/schemafilter/RecordingTarget.java | 2 +- .../test/schemafilter/SchemaFilterTest.java | 23 ++- .../test/schemafilter/SequenceFilterTest.java | 13 +- .../TestExtraPhysicalTableTypes.java | 4 +- .../test/schemaupdate/1_Version.hbm.xml | 2 +- .../test/schemaupdate/2_Version.hbm.xml | 2 +- .../test/schemaupdate/3_Version.hbm.xml | 2 +- .../AbstractAlterTableQuoteSchemaTest.java | 2 +- .../AlterTableQuoteDefaultSchemaTest.java | 3 +- .../AlterTableQuoteSpecifiedSchemaTest.java | 2 +- .../test/schemaupdate/ColumnNamesTest.java | 2 +- .../schemaupdate/CommentGeneration.hbm.xml | 2 +- .../schemaupdate/CommentGenerationTest.java | 4 +- .../schemaupdate/ConnectionsReleaseTest.java | 2 +- .../schemaupdate/ExportIdentifierTest.java | 2 +- .../{ => orm}/test/schemaupdate/Group.java | 2 +- .../H2DialectDataBaseToUpperTest.java | 2 +- ...hemaMigrationTargetScriptCreationTest.java | 2 +- .../schemaupdate/Hbm2ddlCreateOnlyTest.java | 2 +- .../schemaupdate/IdentifierHelperTest.java | 2 +- .../ImplicitCompositeKeyJoinTest.java | 2 +- .../test/schemaupdate/MigrationTest.java | 7 +- .../MixedFieldPropertyAnnotationTest.java | 2 +- .../PostgreSQLMultipleSchemaSequenceTest.java | 6 +- .../QuotedTableNameSchemaUpdateTest.java | 2 +- ...leNameWithForeignKeysSchemaUpdateTest.java | 10 +- .../test/schemaupdate/SchemaDropTest.java | 2 +- .../test/schemaupdate/SchemaExportTest.java | 10 +- ...emaExportWithGlobalQuotingEnabledTest.java | 2 +- ...SchemaExportWithIndexAndDefaultSchema.java | 2 +- ...hemaMigrationTargetScriptCreationTest.java | 2 +- .../SchemaMigratorHaltOnErrorTest.java | 2 +- .../SchemaUpdateDelimiterTest.java | 2 +- .../SchemaUpdateFormatterTest.java | 2 +- ...emaUpdateGeneratingOnlyScriptFileTest.java | 2 +- .../SchemaUpdateHaltOnErrorTest.java | 2 +- ...nColumnNoConstraintSecondaryTableTest.java | 2 +- ...ColumnNoConstraintSecondaryTablesTest.java | 2 +- ...chemaUpdateJoinColumnNoConstraintTest.java | 2 +- .../SchemaUpdateProceedOnErrorTest.java | 2 +- .../SchemaUpdateSQLServerTest.java | 2 +- .../SchemaUpdateSchemaNameTest.java | 2 +- .../SchemaUpdateTableBackedSequenceTest.java | 2 +- .../test/schemaupdate/SchemaUpdateTest.java | 2 +- .../SchemaUpdateWithFunctionIndexTest.java | 2 +- .../SchemaUpdateWithViewsTest.java | 2 +- .../schemaupdate/SequenceReadingTest.java | 2 +- .../SqlServerQuoteSchemaTest.java | 2 +- .../test/schemaupdate/TableCommentTest.java | 2 +- .../test/schemaupdate/TestFkUpdating.java | 2 +- .../{ => orm}/test/schemaupdate/User.java | 2 +- .../test/schemaupdate/UserGroup.hbm.xml | 10 +- .../{ => orm}/test/schemaupdate/Version.java | 2 +- .../derivedid/ColumnLengthTest.java | 2 +- .../schemaupdate/foreignkeys/Employee.java | 2 +- .../foreignkeys/ForeignKeyDropTest.java | 2 +- .../foreignkeys/ForeignKeyGenerationTest.java | 2 +- .../foreignkeys/ForeignKeyMigrationTest.java | 2 +- .../test/schemaupdate/foreignkeys/Group.java | 2 +- .../JoinedInheritanceForeignKeyTest.java | 2 +- .../test/schemaupdate/foreignkeys/Person.java | 2 +- .../test/schemaupdate/foreignkeys/Phone.java | 2 +- .../schemaupdate/foreignkeys/Project.java | 2 +- ...dateWithKeywordAutoQuotingEnabledTest.java | 2 +- .../test/schemaupdate/foreignkeys/User.java | 2 +- .../schemaupdate/foreignkeys/UserSetting.java | 2 +- .../CrossSchemaForeignKeyGenerationTest.java | 4 +- .../crossschema/SchemaOneEntity.java | 2 +- .../crossschema/SchemaTwoEntity.java | 2 +- .../AbstractForeignKeyDefinitionTest.java | 2 +- .../ForeignKeyDefinitionManyToOneTest.java | 2 +- ...gnKeyDefinitionOneToManyJoinTableTest.java | 2 +- .../ForeignKeyDefinitionOneToOneTest.java | 2 +- ...oreignKeyDefinitionSecondaryTableTest.java | 2 +- .../test/schemaupdate/idbag/IdBagOwner.java | 2 +- .../schemaupdate/idbag/IdBagSequenceTest.java | 4 +- .../test/schemaupdate/idbag/Mappings.hbm.xml | 6 +- .../idgenerator/SequenceGenerationTest.java | 2 +- .../idgenerator/SequenceGeneratorsTest.java | 2 +- .../idgenerator/TableGeneratorTest.java | 2 +- .../idgenerator/TableGeneratorsTest.java | 2 +- .../index/ComponentIndexTest.java | 2 +- .../index/IndexesCreationTest.java | 2 +- .../inheritance/CreditCardPayment.java | 2 +- .../schemaupdate/inheritance/Employee.hbm.xml | 4 +- .../schemaupdate/inheritance/Employee.java | 2 +- .../inheritance/ForeignKeyNameTest.java | 12 +- .../schemaupdate/inheritance/Manager.hbm.xml | 4 +- .../schemaupdate/inheritance/Manager.java | 2 +- .../schemaupdate/inheritance/Payment.hbm.xml | 6 +- .../schemaupdate/inheritance/Payment.java | 2 +- .../schemaupdate/inheritance/Person.hbm.xml | 4 +- .../test/schemaupdate/inheritance/Person.java | 2 +- .../inheritance/hhh_x/GroupStep.java | 2 +- .../hhh_x/InheritanceSchemaUpdateTest.java | 2 +- .../schemaupdate/inheritance/hhh_x/Step.java | 2 +- .../inheritance/tableperclass/Category.java | 2 +- .../inheritance/tableperclass/Element.java | 2 +- .../tableperclass/SchemaCreationTest.java | 27 ++-- .../manytomany/ForeignKeyNameTest.java | 4 +- .../test/schemaupdate/manytomany/Group.java | 2 +- .../test/schemaupdate/manytomany/User.java | 2 +- .../schemaupdate/manytomany/UserGroup.hbm.xml | 2 +- .../test/schemaupdate/mapping.hbm.xml | 2 +- .../test/schemaupdate/mapping2.hbm.xml | 2 +- .../uniqueconstraint/TestEntity.hbm.xml | 2 +- .../uniqueconstraint/TestEntity.java | 2 +- .../UniqueConstraintDropTest.java | 15 +- .../UniqueConstraintGenerationTest.java | 4 +- .../JoinTableWithDefaultSchemaTest.java | 2 +- .../LongVarcharValidationTest.java | 2 +- .../NumericValidationTest.java | 2 +- .../SynonymValidationTest.java | 2 +- .../schemavalidation/ViewValidationTest.java | 4 +- .../TableNamesWithUnderscoreTest.java | 2 +- .../TypedValueSerializationTest.java | 2 +- .../service/ClassLoaderServiceImplTest.java | 5 +- .../service/ServiceBootstrappingTest.java | 2 +- .../test/service/TestIntegrator.java | 2 +- .../schema/DropSchemaDuringJtaTxnTest.java | 4 +- .../tool/schema/ExecutionOptionsTestImpl.java | 2 +- .../GroupedSchemaValidatorImplTest.java | 2 +- ...allySchemaValidatorImplConnectionTest.java | 7 +- .../IndividuallySchemaValidatorImplTest.java | 4 +- .../tool/schema/JtaPlatformLoggingTest.java | 12 +- ...ctionPropertyValueEndingWithSpaceTest.java | 2 +- .../SchemaToolTransactionHandlingTest.java | 2 +- .../test/tool/schema/TargetDatabaseImpl.java | 2 +- .../test/tool/schema/TargetStdoutImpl.java | 2 +- .../CheckForExistingForeignKeyTest.java | 2 +- .../scripts/MultiLineImportExtractorTest.java | 2 +- ...rtWithSpacesAfterTheLastStatementTest.java | 2 +- .../MultiLineImportWithTabsAndSpacesTest.java | 2 +- ...ntsWithoutTerminalCharsImportFileTest.java | 2 +- .../test/unidir/BackrefPropertyRefTest.java | 2 +- .../{ => orm}/test/unidir/BackrefTest.java | 8 +- .../{ => orm}/test/unidir/Child.java | 2 +- .../{ => orm}/test/unidir/Child1.java | 70 ++++----- .../{ => orm}/test/unidir/Child2.java | 70 ++++----- .../{ => orm}/test/unidir/Parent.java | 2 +- .../{ => orm}/test/unidir/Parent1.java | 2 +- .../{ => orm}/test/unidir/ParentChild.hbm.xml | 2 +- .../unidir/ParentChildPropertyRef.hbm.xml | 2 +- ...rectionalOneToManyNonPkJoinColumnTest.java | 2 +- .../{ => orm}/test/util/BytesHelperTest.java | 2 +- .../DdlTransactionIsolatorTestingImpl.java | 2 +- .../test/util/JoinedIterableTest.java | 2 +- .../test/util/PropertiesHelperTest.java | 2 +- .../test/util/RowVersionComparatorTest.java | 2 +- .../{ => orm}/test/util/SchemaUtil.java | 2 +- .../test/util/SerializableThing.java | 2 +- .../test/util/SerializationHelperTest.java | 7 +- .../{ => orm}/test/util/StringHelperTest.java | 2 +- .../{ => orm}/test/util/dtd/Child.java | 2 +- .../test/util/dtd/EntityResolverTest.java | 4 +- .../{ => orm}/test/util/dtd/Parent.hbm.xml | 4 +- .../{ => orm}/test/util/dtd/Parent.java | 2 +- .../{ => orm}/test/util/dtd/child.xml | 0 ...reparedStatementSpyConnectionProvider.java | 7 +- .../util/jdbc/TimeZoneConnectionProvider.java | 2 +- .../query/InClauseParameterPaddingTest.java | 1 - .../MaxInExpressionParameterPaddingTest.java | 1 - ...ntityWithBidirectionalAssociationTest.java | 2 +- ...vedIdentitySimpleParentIdClassDepTest.java | 2 +- ...edIdentityIdClassParentIdClassDepTest.java | 2 +- ...dentityIdClassParentEmbeddedIdDepTest.java | 2 +- ...edIdentityEmbeddedIdParentIdClassTest.java | 2 +- ...tityEmbeddedIdParentEmbeddedIdDepTest.java | 2 +- ...mbeddedIdGrandparentEmbeddedIdDepTest.java | 2 +- ...arentEmbeddedIdColumnOverridesDepTest.java | 2 +- ...ivedIdentitySimpleParentSimpleDepTest.java | 2 +- ...ParentSimpleDepSecondPassOrderingTest.java | 2 +- ...IdClassParentSameIdTypeIdClassDepTest.java | 2 +- ...lassParentSameIdTypeEmbeddedIdDepTest.java | 2 +- ...eddedIdParentSameIdTypeIdClassDepTest.java | 2 +- ...edIdParentSameIdTypeEmbeddedIdDepTest.java | 2 +- .../annotations/manytoone/ManyToOneTest.java | 4 +- ...ySQLDropConstraintThrowsExceptionTest.java | 2 +- .../ondemandload/OnDemandLoadTest.java | 2 - .../DiscriminatorMultiTenancyTest.java | 2 +- .../AbstractSchemaBasedMultiTenancyTest.java | 2 +- .../test/querytimeout/QueryTimeOutTest.java | 3 +- .../test/quote/TableGeneratorQuotingTest.java | 2 +- .../timestamp/JdbcTimeCustomTimeZoneTest.java | 2 +- .../JdbcTimeDefaultTimeZoneTest.java | 2 +- ...mestampCustomSessionLevelTimeZoneTest.java | 2 +- .../JdbcTimestampCustomTimeZoneTest.java | 2 +- .../JdbcTimestampDefaultTimeZoneTest.java | 2 +- .../JdbcTimestampUTCTimeZoneTest.java | 2 +- ...bcTimestampWithDefaultUTCTimeZoneTest.java | 2 +- .../JdbcTimestampWithoutUTCTimeZoneTest.java | 2 +- .../tm/JtaBeforeCompletionFailureTest.java | 5 +- .../IntegratorProvidedUserTypeTest.java | 3 +- .../test/annotations/bytecode/Hammer.hbm.xml | 2 +- .../test/annotations/configuration/orm.xml | 0 .../annotations/duplicatedgenerator/orm.xml | 0 .../annotations/enumerated/ormXml/orm.xml | 2 +- .../annotations/fetchprofile/mappings.hbm.xml | 0 .../test/annotations/index/jpa/orm-index.xml | 2 +- .../{ => orm}/test/annotations/orm.xml | 0 .../element-collection-converter-orm.xml | 4 +- .../reflection/metadata-complete.xml | 2 +- .../test/annotations/reflection/orm.xml | 10 +- .../xml/ejb3/element-collection.orm1.xml | 2 +- .../xml/ejb3/element-collection.orm10.xml | 2 +- .../xml/ejb3/element-collection.orm11.xml | 2 +- .../xml/ejb3/element-collection.orm12.xml | 2 +- .../xml/ejb3/element-collection.orm13.xml | 2 +- .../xml/ejb3/element-collection.orm14.xml | 2 +- .../xml/ejb3/element-collection.orm15.xml | 2 +- .../xml/ejb3/element-collection.orm16.xml | 2 +- .../xml/ejb3/element-collection.orm17.xml | 2 +- .../xml/ejb3/element-collection.orm18.xml | 2 +- .../xml/ejb3/element-collection.orm19.xml | 2 +- .../xml/ejb3/element-collection.orm2.xml | 2 +- .../xml/ejb3/element-collection.orm20.xml | 2 +- .../xml/ejb3/element-collection.orm21.xml | 2 +- .../xml/ejb3/element-collection.orm22.xml | 2 +- .../xml/ejb3/element-collection.orm23.xml | 2 +- .../xml/ejb3/element-collection.orm24.xml | 2 +- .../xml/ejb3/element-collection.orm25.xml | 2 +- .../xml/ejb3/element-collection.orm26.xml | 2 +- .../xml/ejb3/element-collection.orm27.xml | 2 +- .../xml/ejb3/element-collection.orm28.xml | 2 +- .../xml/ejb3/element-collection.orm3.xml | 2 +- .../xml/ejb3/element-collection.orm4.xml | 2 +- .../xml/ejb3/element-collection.orm5.xml | 2 +- .../xml/ejb3/element-collection.orm6.xml | 2 +- .../xml/ejb3/element-collection.orm7.xml | 2 +- .../xml/ejb3/element-collection.orm8.xml | 2 +- .../xml/ejb3/element-collection.orm9.xml | 2 +- .../xml/ejb3/many-to-many.orm1.xml | 2 +- .../xml/ejb3/many-to-many.orm10.xml | 2 +- .../xml/ejb3/many-to-many.orm11.xml | 2 +- .../xml/ejb3/many-to-many.orm12.xml | 2 +- .../xml/ejb3/many-to-many.orm13.xml | 2 +- .../xml/ejb3/many-to-many.orm14.xml | 2 +- .../xml/ejb3/many-to-many.orm15.xml | 2 +- .../xml/ejb3/many-to-many.orm16.xml | 2 +- .../xml/ejb3/many-to-many.orm17.xml | 2 +- .../xml/ejb3/many-to-many.orm18.xml | 2 +- .../xml/ejb3/many-to-many.orm19.xml | 2 +- .../xml/ejb3/many-to-many.orm2.xml | 2 +- .../xml/ejb3/many-to-many.orm20.xml | 2 +- .../xml/ejb3/many-to-many.orm21.xml | 2 +- .../xml/ejb3/many-to-many.orm3.xml | 2 +- .../xml/ejb3/many-to-many.orm4.xml | 2 +- .../xml/ejb3/many-to-many.orm5.xml | 2 +- .../xml/ejb3/many-to-many.orm6.xml | 2 +- .../xml/ejb3/many-to-many.orm7.xml | 2 +- .../xml/ejb3/many-to-many.orm8.xml | 2 +- .../xml/ejb3/many-to-many.orm9.xml | 2 +- .../annotations/xml/ejb3/many-to-one.orm1.xml | 2 +- .../annotations/xml/ejb3/many-to-one.orm2.xml | 2 +- .../annotations/xml/ejb3/many-to-one.orm3.xml | 2 +- .../annotations/xml/ejb3/many-to-one.orm4.xml | 2 +- .../annotations/xml/ejb3/many-to-one.orm5.xml | 2 +- .../annotations/xml/ejb3/many-to-one.orm6.xml | 2 +- .../annotations/xml/ejb3/many-to-one.orm7.xml | 2 +- .../annotations/xml/ejb3/many-to-one.orm8.xml | 2 +- .../annotations/xml/ejb3/many-to-one.orm9.xml | 2 +- .../annotations/xml/ejb3/one-to-many.orm1.xml | 2 +- .../xml/ejb3/one-to-many.orm10.xml | 2 +- .../xml/ejb3/one-to-many.orm11.xml | 2 +- .../xml/ejb3/one-to-many.orm12.xml | 2 +- .../xml/ejb3/one-to-many.orm13.xml | 2 +- .../xml/ejb3/one-to-many.orm14.xml | 2 +- .../xml/ejb3/one-to-many.orm15.xml | 2 +- .../xml/ejb3/one-to-many.orm16.xml | 2 +- .../xml/ejb3/one-to-many.orm17.xml | 2 +- .../xml/ejb3/one-to-many.orm18.xml | 2 +- .../xml/ejb3/one-to-many.orm19.xml | 2 +- .../annotations/xml/ejb3/one-to-many.orm2.xml | 2 +- .../xml/ejb3/one-to-many.orm20.xml | 2 +- .../xml/ejb3/one-to-many.orm21.xml | 2 +- .../xml/ejb3/one-to-many.orm22.xml | 2 +- .../xml/ejb3/one-to-many.orm23.xml | 2 +- .../annotations/xml/ejb3/one-to-many.orm3.xml | 2 +- .../annotations/xml/ejb3/one-to-many.orm4.xml | 2 +- .../annotations/xml/ejb3/one-to-many.orm5.xml | 2 +- .../annotations/xml/ejb3/one-to-many.orm6.xml | 2 +- .../annotations/xml/ejb3/one-to-many.orm7.xml | 2 +- .../annotations/xml/ejb3/one-to-many.orm8.xml | 2 +- .../annotations/xml/ejb3/one-to-many.orm9.xml | 2 +- .../annotations/xml/ejb3/one-to-one.orm1.xml | 2 +- .../annotations/xml/ejb3/one-to-one.orm10.xml | 2 +- .../annotations/xml/ejb3/one-to-one.orm11.xml | 2 +- .../annotations/xml/ejb3/one-to-one.orm2.xml | 2 +- .../annotations/xml/ejb3/one-to-one.orm3.xml | 2 +- .../annotations/xml/ejb3/one-to-one.orm4.xml | 2 +- .../annotations/xml/ejb3/one-to-one.orm5.xml | 2 +- .../annotations/xml/ejb3/one-to-one.orm6.xml | 2 +- .../annotations/xml/ejb3/one-to-one.orm7.xml | 2 +- .../annotations/xml/ejb3/one-to-one.orm8.xml | 2 +- .../annotations/xml/ejb3/one-to-one.orm9.xml | 2 +- .../test/annotations/xml/ejb3/orm.xml | 2 +- .../test/annotations/xml/ejb3/orm2.xml | 2 +- .../test/annotations/xml/ejb3/orm3.xml | 2 +- .../test/annotations/xml/ejb3/orm4.xml | 2 +- .../test/annotations/xml/ejb3/orm5.xml | 2 +- .../annotations/xml/ejb3/pre-parsed-orm.xml | 2 +- .../org.hibernate.integrator.spi.Integrator | 2 +- ...reparedStatementSpyConnectionProvider.java | 2 +- .../hikaricp/HikariCPSkipAutoCommitTest.java | 2 +- .../org/hibernate/testing/DialectChecks.java | 5 +- .../BaseNonConfigCoreFunctionalTestCase.java | 2 +- .../orm/junit/DialectFeatureChecks.java | 2 +- 706 files changed, 1150 insertions(+), 1165 deletions(-) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/actionqueue/CustomAfterCompletionTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/actionqueue/CustomBeforeCompletionTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/.gitignore (100%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/Company.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/CreationTimestampTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/EntityTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/Flight.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/InMemoryCreationTimestampNullableColumnTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/InMemoryUpdateTimestampTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/JoinedSubclassTest.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/SafeMappingTest.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/SecuredBindingTest.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/Sky.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/UpdateTimeStampInheritanceTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/UpdateTimestampTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/Address.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/BeanValidationAutoTest.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/BeanValidationDisabledTest.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/BeanValidationGroupsTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/Button.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/Color.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/CupHolder.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/DDLTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/DDLWithoutCallbackTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/Display.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/DisplayConnector.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/HibernateTraversableResolverTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/MergeNotNullCollectionTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/MinMax.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/Music.java (86%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/PowerSupply.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/Rock.java (87%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/Screen.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/Strict.java (83%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/Tv.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/beanvalidation/TvOwner.java (90%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/bytecode/Hammer.java (89%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/bytecode/ProxyBreakingTest.java (90%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/bytecode/Tool.java (87%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/configuration/ConfigurationTest.java (75%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/configuration/package-info.java (85%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e1/b/Dependent.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e1/b/DependentId.java (87%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e1/b/DerivedIdentitySimpleParentEmbeddedIdDepTest.java (95%) rename hibernate-core/src/test/java/org/hibernate/{test/annotations/derivedidentities/e1/c => orm/test/annotations/derivedidentities/e1/b}/Employee.java (85%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e1/b/specjmapid/Customer.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventory.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventoryPK.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e1/b/specjmapid/IdMapManyToOneSpecjTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e1/b/specjmapid/Item.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CompositeKeyDeleteTest.java (90%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwo.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwoPK.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerTwo.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e1/b/specjmapid/lazy/hbm_order.xml (86%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e1/b/specjmapid/lazy/order_orm.xml (82%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e1/c/Dependent.java (89%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e1/c/DerivedIdentitySimpleParentEmbeddedDepTest.java (93%) rename hibernate-core/src/test/java/org/hibernate/{test/annotations/derivedidentities/e1/b => orm/test/annotations/derivedidentities/e1/c}/Employee.java (85%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e4/b/FinancialHistory.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e4/b/MedicalHistory.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e4/b/Person.java (87%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e5/c/ForeignGeneratorViaMapsIdTest.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e5/c/MedicalHistory.java (90%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/derivedidentities/e5/c/Person.java (86%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/duplicatedgenerator/DuplicateTest.java (77%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/duplicatedgenerator/Flight.java (88%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Address.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/BasicHibernateAnnotationsTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Bid.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Car.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/CasterStringType.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/CommunityBid.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/ContactDetails.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Country.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Doctor.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Drill.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/FirstName.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Flight.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Forest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Forest2.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/FormalLastName.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/HibernateAnnotationMappingTest.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Java5FeaturesTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/LastName.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Length.java (86%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/LocalContactDetails.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/MonetaryAmount.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Month.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Name.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Narrative.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/NewCustomEntityMappingAnnotationsTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/OverseasPhoneNumber.java (90%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Peugot.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/PhoneNumber.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/PhoneNumberType.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Player.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/PowerDrill.java (89%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/PropertyDefaultMappingsTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Race.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Ransom.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/SoccerTeam.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Starred.java (86%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Tool.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Topic.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Tree.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/WashingMachine.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/Widget.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/ZipCode.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entity/package-info.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entitynonentity/Cellular.java (84%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entitynonentity/Communication.java (85%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entitynonentity/EntityNonEntityTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entitynonentity/GSM.java (86%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entitynonentity/Interaction.java (88%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entitynonentity/Phone.java (86%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/entitynonentity/Voice.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/enumerated/mapkey/MapKeyEnumeratedTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/enumerated/mapkey/SocialNetwork.java (84%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/enumerated/mapkey/SocialNetworkProfile.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/enumerated/mapkey/User.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/enumerated/mappedSuperclass/EnumeratedWithMappedSuperclassTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/enumerated/ormXml/Binding.java (84%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/enumerated/ormXml/BookWithOrmEnum.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/enumerated/ormXml/OrmXmlEnumTypeTest.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/fetchprofile/Country.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/fetchprofile/Customer.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/fetchprofile/Customer2.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/fetchprofile/Customer3.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/fetchprofile/Customer4.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/fetchprofile/Customer5.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/fetchprofile/Customer6.java (87%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/fetchprofile/FetchProfileTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/fetchprofile/MappedByFetchProfileFunctionTest.java (90%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/fetchprofile/MappedByFetchProfileUnitTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/fetchprofile/MoreFetchProfileTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/fetchprofile/Order.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/fetchprofile/SupportTickets.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/fetchprofile/mappedby/Address.java (88%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/fetchprofile/mappedby/package-info.java (77%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/fetchprofile/package-info.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/index/jpa/AbstractJPAIndexTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/index/jpa/Car.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/index/jpa/Dealer.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/index/jpa/Importer.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/index/jpa/IndexTest.java (90%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/index/jpa/OrmXmlIndexTest.java (74%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/indexcoll/eager/Atmosphere.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/indexcoll/eager/EagerIndexedCollectionTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/join/A.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/join/B.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/join/C.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/join/Cat.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/join/Death.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/join/Dog.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/join/DogPk.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/join/JoinTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/join/Life.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/join/SysGroupsOrm.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/join/SysUserOrm.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/join/namingstrategy/Life.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/join/namingstrategy/NamingStrategyJoinTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/join/namingstrategy/SimpleCat.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/join/namingstrategy/TestNamingStrategy.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/lob/locator/LobHolder.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/lob/locator/LobLocatorTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/manytomany/defaults/Category.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/manytomany/defaults/City.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/manytomany/defaults/ContactInfo.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/manytomany/defaults/Employee.java (86%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/manytomany/defaults/Item.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/manytomany/defaults/JpaCompliantManyToManyImplicitNamingTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/manytomany/defaults/KnownClient.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/manytomany/defaults/ManyToManyImplicitNamingTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/manytomany/defaults/PhoneNumber.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/manytomany/defaults/Store.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/manytoone/NotNullManyToOneTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/namingstrategy/A.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/namingstrategy/Address.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/namingstrategy/AddressEntry.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/namingstrategy/DummyNamingStrategy.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/namingstrategy/LongIdentifierNamingStrategy.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/namingstrategy/LongKeyNamingStrategyTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/namingstrategy/NamingStrategyTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/namingstrategy/Person.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/namingstrategy/charset/Iso88591CharsetNamingStrategyTest.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/namingstrategy/charset/Utf8CharsetNamingStrategyTest.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/onetoone/hhh4851/BaseEntity.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/onetoone/hhh4851/Device.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/onetoone/hhh4851/HHH4851Test.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/onetoone/hhh4851/Hardware.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/onetoone/hhh4851/ManagedDevice.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/onetoone/hhh4851/Owner.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/persister/Card.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/persister/CollectionPersister.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/persister/Deck.java (73%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/persister/EntityPersister.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/persister/PersisterTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/quote/resultsetmappings/MyEntity.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/reflection/Administration.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/reflection/Availability.java (85%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/reflection/BusTrip.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/reflection/BusTripPk.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/reflection/Company.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/reflection/Competition.java (87%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/reflection/ElementCollectionConverterTest.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/reflection/LogListener.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/reflection/Match.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/reflection/Organization.java (90%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/reflection/OrganizationConverter.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/reflection/OtherLogListener.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/reflection/SocialSecurityMoralAccount.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/reflection/SocialSecurityNumber.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/reflection/SocialSecurityPhysicalAccount.java (88%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/reflection/TennisMatch.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/reflection/XMLContextTest.java (82%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/secondarytable/SecondaryTableSchemaTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/selectbeforeupdate/UpdateDetachedTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/strategy/Location.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/strategy/Storm.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/strategy/StrategyTest.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/subselect/Bid.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/subselect/HighestBid.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/subselect/Item.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/subselect/SubselectTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/target/Brand.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/target/Luggage.java (89%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/target/LuggageImpl.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/target/Owner.java (87%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/target/OwnerImpl.java (90%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/target/Size.java (87%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/target/SizeImpl.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/target/TargetTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/uniqueconstraint/UniqueConstraintTest.java (88%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/various/IndexTest.java (86%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/various/OptimisticLockAnnotationTest.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/xml/ejb3/CarModel.java (90%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/xml/ejb3/Company.java (88%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/xml/ejb3/Ejb3XmlTest.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/xml/ejb3/Ejb3XmlTestCase.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/xml/ejb3/Entity1.java (88%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/xml/ejb3/Entity2.java (88%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/xml/ejb3/Entity3.java (88%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/xml/ejb3/Light.java (86%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/xml/ejb3/Lighter.java (86%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/xml/ejb3/Manufacturer.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/xml/ejb3/Model.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java (89%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/xml/ejb3/PreParsedOrmXmlTest.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/annotations/xml/ejb3/VicePresident.java (84%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/batch/BatchOptimisticLockingTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/batch/BatchTest.java (96%) mode change 100755 => 100644 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/batch/BatchingBatchFailureTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/batch/BatchingInheritanceDeleteTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/batch/DataPoint.hbm.xml (95%) mode change 100755 => 100644 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/batch/DataPoint.java (97%) mode change 100755 => 100644 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/batch/NonBatchingBatchFailureTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/batch/OptionalSecondaryTableBatchTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/boot/cfgXml/CfgXmlParsingTest.java (88%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/boot/cfgXml/badnamespace.cfg.xml (100%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/boot/cfgXml/hibernate.cfg.xml (100%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/boot/database/qualfiedTableNaming/NamespaceTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/boot/database/qualfiedTableNaming/QualifiedTableNamingTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/boot/jaxb/hbm/internal/EntityModeConverterTest.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/boot/jaxb/hbm/internal/GenerationTimingConverterTest.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/boot/jaxb/hbm/internal/XmlBindingChecker.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/boot/model/relational/QualifiedNameParserTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/boot/model/source/AttributePathTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/Bean.hbm.xml (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/Bean.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/BeanReflectionHelper.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/InvocationTargetExceptionTest.java (90%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/ProxyBean.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/ReflectionOptimizerTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/access/MixedAccessTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/association/InheritedAttributeAssociationTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/association/ManyToManyAssociationTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/association/OneToManyAssociationTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/association/OneToOneAssociationTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/basic/BasicEnhancementTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/basic/BasicSessionTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/basic/CrossEnhancementTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/basic/ExtendedAssociationManagementTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/basic/GenericReturnValueMappedSuperclassEnhancementTest.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/basic/InheritedTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/basic/MappedSuperclassTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/basic/ObjectAttributeMarkerInterceptor.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/detached/DetachedGetIdentifierTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/dirty/DirtyTrackingCollectionInDefaultFetchGroupTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/dirty/DirtyTrackingCollectionTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/dirty/DirtyTrackingNonUpdateableTest.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/dirty/DirtyTrackingPersistTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/dirty/DirtyTrackingTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/eviction/EvictionTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/lazy/LazyBasicFieldNotInitializedTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/lazy/LazyCollectionDetachTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/lazy/LazyInitializationWithoutInlineDirtyTrackingTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/lazy/LazyOneToManyWithEqualsImplementationTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/lazy/LazyProxyOnEnhancedEntityTest.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/lazy/cache/LazyInCacheTest.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/lazy/cache/UninitializedLazyBasicCacheTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/lazy/proxy/MappedSuperclassWithEmbeddableTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/lazy/proxy/ProxyDeletionTest.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/lazy/proxy/SharingReferenceTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/merge/CompositeMergeTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/merge/Leaf.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/merge/MergeDetachedCascadedCollectionInEmbeddableTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/merge/MergeDetachedNonCascadedCollectionInEmbeddableTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/merge/MergeEnhancedDetachedOrphanRemovalTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/merge/MergeEnhancedEntityTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/merge/Root.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/mutable/MapStringConverter.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/mutable/MutableTypeEnhancementTestCase.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/mutable/TestEntity.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/otherentityentrycontext/OtherEntityEntryContextTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/pk/EmbeddedPKTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/tracker/CompositeOwnerTrackerTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/bytecode/enhancement/tracker/DirtyTrackerTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/id/idClass/IdClassNamingStrategyTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/id/idClass/MyEntity.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/id/idClass/MyEntityId.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/common/DatabaseConnectionInfo.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/common/SynchronizationCollectorImpl.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/common/SynchronizationErrorImpl.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/LegacySettingInitiatorTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/SynchronizationRegistryStandardImplTests.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/jdbc/AlreadyStartedTransactionTest.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/jdbc/BasicJdbcTransactionTests.java (90%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/jdbc/LogicalConnectionTestingImpl.java (83%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/jdbc/TransactionCoordinatorOwnerTestingImpl.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/jdbc/autocommit/AbstractSkipAutoCommitTest.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/jdbc/autocommit/H2SkipAutoCommitTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/jdbc/autocommit/MySQLSkipAutoCommitTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/jdbc/autocommit/OracleSkipAutoCommitTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/jdbc/autocommit/PostgreSQLSkipAutoCommitTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/jdbc/autocommit/SQLServerSkipAutoCommitTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/jta/AbstractBasicJtaTestScenarios.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/jta/BasicJtaTransactionManagerTests.java (76%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/jta/BasicJtaUserTransactionTests.java (76%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/jta/InaccessibleJtaPlatformTests.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/jta/JpaComplianceAlreadyStartedTransactionTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/jta/JtaPlatformInaccessibleImpl.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/jta/JtaPlatformStandardTestingImpl.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/jta/NonJpaComplianceAlreadyStartedTransactionTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/resource/transaction/jta/TransactionCoordinatorOwnerTestingImpl.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemafilter/CatalogFilterTest.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemafilter/RecordingTarget.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemafilter/SchemaFilterTest.java (85%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemafilter/SequenceFilterTest.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schematools/TestExtraPhysicalTableTypes.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/1_Version.hbm.xml (89%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/2_Version.hbm.xml (89%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/3_Version.hbm.xml (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/AbstractAlterTableQuoteSchemaTest.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/ColumnNamesTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/CommentGeneration.hbm.xml (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/CommentGenerationTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/ConnectionsReleaseTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/ExportIdentifierTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/Group.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/H2DialectDataBaseToUpperTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/Hbm2ddlCreateOnlyTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/IdentifierHelperTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/ImplicitCompositeKeyJoinTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/MigrationTest.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/MixedFieldPropertyAnnotationTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/QuotedTableNameSchemaUpdateTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/QuotedTableNameWithForeignKeysSchemaUpdateTest.java (87%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SchemaDropTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SchemaExportTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SchemaExportWithGlobalQuotingEnabledTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SchemaExportWithIndexAndDefaultSchema.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SchemaUpdateDelimiterTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SchemaUpdateFormatterTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SchemaUpdateGeneratingOnlyScriptFileTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SchemaUpdateHaltOnErrorTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTableTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTablesTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SchemaUpdateProceedOnErrorTest.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SchemaUpdateSQLServerTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SchemaUpdateSchemaNameTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SchemaUpdateTableBackedSequenceTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SchemaUpdateTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SchemaUpdateWithViewsTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SequenceReadingTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/SqlServerQuoteSchemaTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/TableCommentTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/TestFkUpdating.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/User.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/UserGroup.hbm.xml (79%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/Version.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/derivedid/ColumnLengthTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/foreignkeys/Employee.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/foreignkeys/ForeignKeyDropTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/foreignkeys/ForeignKeyGenerationTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/foreignkeys/ForeignKeyMigrationTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/foreignkeys/Group.java (90%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/foreignkeys/JoinedInheritanceForeignKeyTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/foreignkeys/Person.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/foreignkeys/Phone.java (89%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/foreignkeys/Project.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/foreignkeys/SchemaUpdateWithKeywordAutoQuotingEnabledTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/foreignkeys/User.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/foreignkeys/UserSetting.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/foreignkeys/crossschema/CrossSchemaForeignKeyGenerationTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/foreignkeys/crossschema/SchemaOneEntity.java (86%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/foreignkeys/crossschema/SchemaTwoEntity.java (90%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/foreignkeys/definition/AbstractForeignKeyDefinitionTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionManyToOneTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToManyJoinTableTest.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToOneTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionSecondaryTableTest.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/idbag/IdBagOwner.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/idbag/IdBagSequenceTest.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/idbag/Mappings.hbm.xml (84%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/idgenerator/SequenceGenerationTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/idgenerator/SequenceGeneratorsTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/idgenerator/TableGeneratorTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/idgenerator/TableGeneratorsTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/index/ComponentIndexTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/index/IndexesCreationTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/inheritance/CreditCardPayment.java (90%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/inheritance/Employee.hbm.xml (67%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/inheritance/Employee.java (86%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/inheritance/ForeignKeyNameTest.java (85%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/inheritance/Manager.hbm.xml (66%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/inheritance/Manager.java (86%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/inheritance/Payment.hbm.xml (75%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/inheritance/Payment.java (90%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/inheritance/Person.hbm.xml (79%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/inheritance/Person.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/inheritance/hhh_x/GroupStep.java (89%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/inheritance/hhh_x/InheritanceSchemaUpdateTest.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/inheritance/hhh_x/Step.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/inheritance/tableperclass/Category.java (85%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/inheritance/tableperclass/Element.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/inheritance/tableperclass/SchemaCreationTest.java (78%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/manytomany/ForeignKeyNameTest.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/manytomany/Group.java (89%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/manytomany/User.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/manytomany/UserGroup.hbm.xml (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/mapping.hbm.xml (89%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/mapping2.hbm.xml (87%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/uniqueconstraint/TestEntity.hbm.xml (88%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/uniqueconstraint/TestEntity.java (87%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemaupdate/uniqueconstraint/UniqueConstraintGenerationTest.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemavalidation/JoinTableWithDefaultSchemaTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemavalidation/LongVarcharValidationTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemavalidation/NumericValidationTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemavalidation/SynonymValidationTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemavalidation/ViewValidationTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/schemavalidation/matchingtablenames/TableNamesWithUnderscoreTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/serialization/TypedValueSerializationTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/service/ClassLoaderServiceImplTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/service/ServiceBootstrappingTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/service/TestIntegrator.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/tool/schema/DropSchemaDuringJtaTxnTest.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/tool/schema/ExecutionOptionsTestImpl.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/tool/schema/GroupedSchemaValidatorImplTest.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/tool/schema/IndividuallySchemaValidatorImplTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/tool/schema/JtaPlatformLoggingTest.java (78%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/tool/schema/SchemaGenetationSciptsActionPropertyValueEndingWithSpaceTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/tool/schema/SchemaToolTransactionHandlingTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/tool/schema/TargetDatabaseImpl.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/tool/schema/TargetStdoutImpl.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/tool/schema/internal/CheckForExistingForeignKeyTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/tool/schema/scripts/MultiLineImportExtractorTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/tool/schema/scripts/MultiLineImportWithSpacesAfterTheLastStatementTest.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/tool/schema/scripts/MultiLineImportWithTabsAndSpacesTest.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/unidir/BackrefPropertyRefTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/unidir/BackrefTest.java (96%) mode change 100755 => 100644 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/unidir/Child.java (95%) mode change 100755 => 100644 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/unidir/Child1.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/unidir/Child2.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/unidir/Parent.java (95%) mode change 100755 => 100644 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/unidir/Parent1.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/unidir/ParentChild.hbm.xml (95%) mode change 100755 => 100644 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/unidir/ParentChildPropertyRef.hbm.xml (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/util/BytesHelperTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/util/DdlTransactionIsolatorTestingImpl.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/util/JoinedIterableTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/util/PropertiesHelperTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/util/RowVersionComparatorTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/util/SchemaUtil.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/util/SerializableThing.java (90%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/util/SerializationHelperTest.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/util/StringHelperTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/util/dtd/Child.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/util/dtd/EntityResolverTest.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/util/dtd/Parent.hbm.xml (81%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/util/dtd/Parent.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/util/dtd/child.xml (100%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/util/jdbc/PreparedStatementSpyConnectionProvider.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/util/jdbc/TimeZoneConnectionProvider.java (96%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/bytecode/Hammer.hbm.xml (88%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/configuration/orm.xml (100%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/duplicatedgenerator/orm.xml (100%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/enumerated/ormXml/orm.xml (85%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/fetchprofile/mappings.hbm.xml (100%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/index/jpa/orm-index.xml (97%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/orm.xml (100%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/reflection/element-collection-converter-orm.xml (80%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/reflection/metadata-complete.xml (97%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/reflection/orm.xml (91%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm1.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm10.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm11.xml (94%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm12.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm13.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm14.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm15.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm16.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm17.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm18.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm19.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm2.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm20.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm21.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm22.xml (94%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm23.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm24.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm25.xml (96%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm26.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm27.xml (95%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm28.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm3.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm4.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm5.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm6.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm7.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm8.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/element-collection.orm9.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm1.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm10.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm11.xml (94%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm12.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm13.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm14.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm15.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm16.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm17.xml (95%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm18.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm19.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm2.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm20.xml (94%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm21.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm3.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm4.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm5.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm6.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm7.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm8.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-many.orm9.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-one.orm1.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-one.orm2.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-one.orm3.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-one.orm4.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-one.orm5.xml (95%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-one.orm6.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-one.orm7.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-one.orm8.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/many-to-one.orm9.xml (94%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm1.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm10.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm11.xml (94%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm12.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm13.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm14.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm15.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm16.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm17.xml (95%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm18.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm19.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm2.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm20.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm21.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm22.xml (94%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm23.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm3.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm4.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm5.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm6.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm7.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm8.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-many.orm9.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-one.orm1.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-one.orm10.xml (94%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-one.orm11.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-one.orm2.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-one.orm3.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-one.orm4.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-one.orm5.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-one.orm6.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-one.orm7.xml (95%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-one.orm8.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/one-to-one.orm9.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/orm.xml (97%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/orm2.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/orm3.xml (92%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/orm4.xml (96%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/orm5.xml (93%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/annotations/xml/ejb3/pre-parsed-orm.xml (84%) rename hibernate-core/src/test/resources/org/hibernate/{ => orm}/test/service/org.hibernate.integrator.spi.Integrator (56%) rename hibernate-hikaricp/src/test/java/org/hibernate/{ => orm}/test/util/PreparedStatementSpyConnectionProvider.java (99%) diff --git a/documentation/src/test/java/org/hibernate/userguide/multitenancy/AbstractMultiTenancyTest.java b/documentation/src/test/java/org/hibernate/userguide/multitenancy/AbstractMultiTenancyTest.java index b0f60e1335..e86b5fe4be 100644 --- a/documentation/src/test/java/org/hibernate/userguide/multitenancy/AbstractMultiTenancyTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/multitenancy/AbstractMultiTenancyTest.java @@ -37,7 +37,7 @@ import org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase; import org.hibernate.testing.AfterClassOnce; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.util.DdlTransactionIsolatorTestingImpl; +import org.hibernate.orm.test.util.DdlTransactionIsolatorTestingImpl; import org.junit.Test; /** diff --git a/documentation/src/test/java/org/hibernate/userguide/multitenancy/DatabaseTimeZoneMultiTenancyTest.java b/documentation/src/test/java/org/hibernate/userguide/multitenancy/DatabaseTimeZoneMultiTenancyTest.java index 883be02f80..db3e200795 100644 --- a/documentation/src/test/java/org/hibernate/userguide/multitenancy/DatabaseTimeZoneMultiTenancyTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/multitenancy/DatabaseTimeZoneMultiTenancyTest.java @@ -45,7 +45,7 @@ import org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase; import org.hibernate.testing.AfterClassOnce; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.util.DdlTransactionIsolatorTestingImpl; +import org.hibernate.orm.test.util.DdlTransactionIsolatorTestingImpl; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java index ef6697700b..22cd4af362 100755 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java @@ -369,6 +369,11 @@ public class DerbyDialect extends Dialect { : SequenceInformationExtractorDerbyDatabaseImpl.INSTANCE; } + @Override + public String[] getDropSchemaCommand(String schemaName) { + return new String[] {"drop schema " + schemaName + " restrict"}; + } + @Override public String getSelectClauseNullString(int sqlType) { return DB2Dialect.selectNullString( sqlType ); diff --git a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhancerWildFlyNamesTest.java b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhancerWildFlyNamesTest.java index 42de28c88c..385d9df342 100644 --- a/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhancerWildFlyNamesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhancerWildFlyNamesTest.java @@ -13,10 +13,8 @@ import java.io.InputStream; import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl; import org.hibernate.bytecode.enhance.spi.DefaultEnhancementContext; import org.hibernate.bytecode.enhance.spi.Enhancer; -import org.hibernate.bytecode.internal.bytebuddy.ByteBuddyState; import org.hibernate.testing.TestForIssue; -import org.hibernate.test.bytecode.Bean; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/criteria/literal/AbstractCriteriaLiteralHandlingModeTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/criteria/literal/AbstractCriteriaLiteralHandlingModeTest.java index 1b5dab0546..6274982323 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/criteria/literal/AbstractCriteriaLiteralHandlingModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/criteria/literal/AbstractCriteriaLiteralHandlingModeTest.java @@ -9,19 +9,15 @@ package org.hibernate.jpa.test.criteria.literal; import java.util.List; import java.util.Map; import javax.persistence.Entity; -import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Tuple; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; -import org.hibernate.dialect.H2Dialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.jdbc.SQLStatementInterceptor; -import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider; import org.junit.Before; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/lock/StatementIsClosedAfterALockExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/lock/StatementIsClosedAfterALockExceptionTest.java index 09d374cc30..bb35f9b4a5 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/lock/StatementIsClosedAfterALockExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/lock/StatementIsClosedAfterALockExceptionTest.java @@ -12,11 +12,9 @@ import java.util.HashMap; import java.util.Map; import javax.persistence.LockModeType; import org.hibernate.Session; -import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.CockroachDialect; -import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; -import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider; +import org.hibernate.orm.test.util.jdbc.PreparedStatementSpyConnectionProvider; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.SkipForDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NamedQueryCommentTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NamedQueryCommentTest.java index c0e07bcea0..273a32adc1 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NamedQueryCommentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NamedQueryCommentTest.java @@ -27,7 +27,6 @@ import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.jdbc.SQLStatementInterceptor; -import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/actionqueue/CustomAfterCompletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/actionqueue/CustomAfterCompletionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java index 9806c82066..2fec7b9021 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/actionqueue/CustomAfterCompletionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.actionqueue; +package org.hibernate.orm.test.actionqueue; import java.util.concurrent.atomic.AtomicBoolean; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/actionqueue/CustomBeforeCompletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/actionqueue/CustomBeforeCompletionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java index ef778b4157..19a4323dca 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/actionqueue/CustomBeforeCompletionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.actionqueue; +package org.hibernate.orm.test.actionqueue; import java.util.concurrent.atomic.AtomicBoolean; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/.gitignore b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/.gitignore similarity index 100% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/.gitignore rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/.gitignore diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Company.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/Company.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Company.java index 732879ff2e..5c80ca523f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/Company.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Company.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations; +package org.hibernate.orm.test.annotations; import java.io.Serializable; import java.util.Date; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/CreationTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/CreationTimestampTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java index 0191e1bebe..08aef97cba 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/CreationTimestampTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.annotations; +package org.hibernate.orm.test.annotations; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/EntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/EntityTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java index 5dd684f870..315f556a97 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/EntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations; +package org.hibernate.orm.test.annotations; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/Flight.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Flight.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/Flight.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Flight.java index 41cc3746b9..79e33a8531 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/Flight.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Flight.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations; +package org.hibernate.orm.test.annotations; import java.io.Serializable; import java.util.Calendar; import java.util.Date; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/InMemoryCreationTimestampNullableColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/InMemoryCreationTimestampNullableColumnTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java index b937772e97..9d17f910c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/InMemoryCreationTimestampNullableColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations; +package org.hibernate.orm.test.annotations; import java.util.Date; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/InMemoryUpdateTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryUpdateTimestampTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/InMemoryUpdateTimestampTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryUpdateTimestampTest.java index 6b47d1ed80..3cd9744251 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/InMemoryUpdateTimestampTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryUpdateTimestampTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations; +package org.hibernate.orm.test.annotations; import java.util.Date; import java.util.concurrent.atomic.AtomicReference; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/JoinedSubclassTest.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/JoinedSubclassTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/JoinedSubclassTest.java index 51e500a383..d2b6f19c3b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/JoinedSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/JoinedSubclassTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations; +package org.hibernate.orm.test.annotations; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; @@ -14,6 +14,11 @@ import org.hibernate.orm.test.annotations.inheritance.Carrot; import org.hibernate.orm.test.annotations.inheritance.Tomato; import org.hibernate.orm.test.annotations.inheritance.Vegetable; import org.hibernate.orm.test.annotations.inheritance.VegetablePk; + +import org.hibernate.test.annotations.AmericaCupClass; +import org.hibernate.test.annotations.Boat; +import org.hibernate.test.annotations.Country; +import org.hibernate.test.annotations.Ferry; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/SafeMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/SafeMappingTest.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/SafeMappingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/SafeMappingTest.java index 19e1db4e87..51f928f6b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/SafeMappingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/SafeMappingTest.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations; +package org.hibernate.orm.test.annotations; import org.junit.Test; import org.hibernate.AnnotationException; @@ -16,6 +16,8 @@ import org.hibernate.cfg.Environment; import org.hibernate.service.ServiceRegistry; import org.hibernate.testing.ServiceRegistryBuilder; +import org.hibernate.test.annotations.IncorrectEntity; + import static org.junit.Assert.fail; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/SecuredBindingTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/SecuredBindingTest.java index 5ad40ede70..dd895289ac 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/SecuredBindingTest.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations; +package org.hibernate.orm.test.annotations; import java.util.Properties; @@ -17,6 +17,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.service.ServiceRegistry; import org.hibernate.testing.ServiceRegistryBuilder; +import org.hibernate.test.annotations.Plane; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/Sky.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Sky.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/Sky.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Sky.java index 2ddcbed8c9..3483350011 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/Sky.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Sky.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations; +package org.hibernate.orm.test.annotations; import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/UpdateTimeStampInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/UpdateTimeStampInheritanceTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java index 944e8babde..e53da5213f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/UpdateTimeStampInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations; +package org.hibernate.orm.test.annotations; import java.util.Date; import java.util.HashSet; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/UpdateTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/UpdateTimestampTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java index c3869f59fc..4aacd40261 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/UpdateTimestampTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations; +package org.hibernate.orm.test.annotations; import org.hibernate.annotations.UpdateTimestamp; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Address.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Address.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Address.java index 14c8f228e2..7b1b8d142d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Address.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Transient; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationAutoTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationAutoTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationAutoTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationAutoTest.java index 89226d1d0f..0f4bca008f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationAutoTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationAutoTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import java.math.BigDecimal; import javax.validation.ConstraintViolationException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationDisabledTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationDisabledTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationDisabledTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationDisabledTest.java index 7c0db05eba..43ad8922ac 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationDisabledTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationDisabledTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import java.math.BigDecimal; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationGroupsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationGroupsTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationGroupsTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationGroupsTest.java index 9147e365c7..e5e7abf0e4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationGroupsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationGroupsTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import java.lang.annotation.Annotation; import java.math.BigDecimal; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java index 76b4cd707a..871725fa8d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import java.math.BigDecimal; import java.util.Locale; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Button.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Button.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Button.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Button.java index 02a1e11227..45fab2fee9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Button.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Button.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import javax.persistence.Column; import javax.persistence.Embeddable; import javax.validation.constraints.Max; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Color.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Color.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Color.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Color.java index 9e6853f378..7a35cc85c1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Color.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Color.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/CupHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/CupHolder.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/CupHolder.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/CupHolder.java index 223a83cb73..04af03118c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/CupHolder.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/CupHolder.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import java.math.BigDecimal; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLTest.java index cbb85c4b03..19a36c2b90 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLWithoutCallbackTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLWithoutCallbackTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLWithoutCallbackTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLWithoutCallbackTest.java index ea50a0ba5c..6969311ada 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLWithoutCallbackTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLWithoutCallbackTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import java.math.BigDecimal; import java.util.Map; @@ -14,8 +14,6 @@ import javax.persistence.Id; import javax.persistence.PersistenceException; import javax.validation.ConstraintViolationException; -import org.hibernate.Session; -import org.hibernate.Transaction; import org.hibernate.mapping.Column; import org.hibernate.mapping.PersistentClass; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Display.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Display.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Display.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Display.java index 0aa6838209..39706c46b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Display.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Display.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DisplayConnector.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DisplayConnector.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DisplayConnector.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DisplayConnector.java index f170ea6f2f..29b010fdd2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DisplayConnector.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DisplayConnector.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import javax.persistence.CascadeType; import javax.persistence.Embeddable; import javax.persistence.ManyToOne; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/HibernateTraversableResolverTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/HibernateTraversableResolverTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/HibernateTraversableResolverTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/HibernateTraversableResolverTest.java index ac542c9c29..e46c849244 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/HibernateTraversableResolverTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/HibernateTraversableResolverTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import java.math.BigDecimal; import javax.validation.ConstraintViolation; @@ -14,7 +14,6 @@ import org.junit.Test; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MergeNotNullCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MergeNotNullCollectionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java index 87b68ea375..306d157f4f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MergeNotNullCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java index 15e9f60b00..fe06a478a1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MinMax.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MinMax.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MinMax.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MinMax.java index 6ec1d092c8..3daecb0d5f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MinMax.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MinMax.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Music.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Music.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Music.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Music.java index 0111f3eaa3..827b9d104d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Music.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Music.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/PowerSupply.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/PowerSupply.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/PowerSupply.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/PowerSupply.java index ffa10b6ea8..0a201054f7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/PowerSupply.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/PowerSupply.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import java.math.BigDecimal; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Rock.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Rock.java similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Rock.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Rock.java index 6006b3466d..49e8e412af 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Rock.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Rock.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import javax.persistence.Entity; import javax.validation.constraints.NotNull; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Screen.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Screen.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Screen.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Screen.java index 75a175ce28..5dae80bfa6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Screen.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Screen.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import java.util.HashSet; import java.util.Set; import javax.persistence.CascadeType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Strict.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Strict.java similarity index 83% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Strict.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Strict.java index 37b70a6640..7efce04143 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Strict.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Strict.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Tv.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Tv.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Tv.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Tv.java index 48f3333cfd..e80cc4bed2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Tv.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/Tv.java @@ -1,71 +1,71 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ - -package org.hibernate.test.annotations.beanvalidation; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Date; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Column; -import javax.validation.Valid; -import javax.validation.constraints.Future; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - -import org.hibernate.validator.constraints.Length; - -/** - * @author Emmanuel Bernard - * @author Hardy Ferentschik - */ -@Entity -public class Tv { - - @Id - @Size(max = 2) - public String serial; - - @Length(max = 5) - public String model; - - public int size; - - @Size(max = 2) - public String name; - - @Future - public Date expDate; - - @Size(min = 0) - public String description; - - @Min(1000) - public BigInteger lifetime; - - @NotNull - @Valid - public Tuner tuner; - - @Valid - public Recorder recorder; - - @Embeddable - public static class Tuner { - @NotNull - public String frequency; - } - - @Embeddable - public static class Recorder { - @NotNull - @Column(name = "`time`") - public BigDecimal time; - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ + +package org.hibernate.orm.test.annotations.beanvalidation; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.Date; +import javax.persistence.Embeddable; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Column; +import javax.validation.Valid; +import javax.validation.constraints.Future; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; + +import org.hibernate.validator.constraints.Length; + +/** + * @author Emmanuel Bernard + * @author Hardy Ferentschik + */ +@Entity +public class Tv { + + @Id + @Size(max = 2) + public String serial; + + @Length(max = 5) + public String model; + + public int size; + + @Size(max = 2) + public String name; + + @Future + public Date expDate; + + @Size(min = 0) + public String description; + + @Min(1000) + public BigInteger lifetime; + + @NotNull + @Valid + public Tuner tuner; + + @Valid + public Recorder recorder; + + @Embeddable + public static class Tuner { + @NotNull + public String frequency; + } + + @Embeddable + public static class Recorder { + @NotNull + @Column(name = "`time`") + public BigDecimal time; + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/TvOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/TvOwner.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/TvOwner.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/TvOwner.java index 5352b2461e..ea92c89050 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/TvOwner.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/TvOwner.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.beanvalidation; +package org.hibernate.orm.test.annotations.beanvalidation; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/Hammer.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/Hammer.java index 99b9d26cbb..3589894cf6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/Hammer.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.bytecode; +package org.hibernate.orm.test.annotations.bytecode; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/ProxyBreakingTest.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/ProxyBreakingTest.java index 30ed90df7a..ad10a57bda 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/ProxyBreakingTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.bytecode; +package org.hibernate.orm.test.annotations.bytecode; import org.hibernate.Hibernate; import org.hibernate.Session; @@ -39,7 +39,7 @@ public class ProxyBreakingTest extends BaseCoreFunctionalTestCase { @Override protected String[] getOrmXmlFiles() { return new String[] { - "org/hibernate/test/annotations/bytecode/Hammer.hbm.xml" + "org/hibernate/orm/test/annotations/bytecode/Hammer.hbm.xml" }; } } diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/bytecode/Tool.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/Tool.java similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/bytecode/Tool.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/Tool.java index d24cc2514e..a0b3f695ce 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/bytecode/Tool.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/Tool.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.bytecode; +package org.hibernate.orm.test.annotations.bytecode; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/configuration/ConfigurationTest.java similarity index 75% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/configuration/ConfigurationTest.java index dc7c681996..a3ce20438c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/configuration/ConfigurationTest.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.configuration; +package org.hibernate.orm.test.annotations.configuration; import org.hibernate.cfg.Configuration; @@ -21,8 +21,8 @@ public class ConfigurationTest { public void testMixPackageAndResourceOrdering() throws Exception { try { Configuration config = new Configuration(); - config.addResource( "org/hibernate/test/annotations/configuration/orm.xml" ); - config.addPackage( "org.hibernate.test.annotations.configuration" ); + config.addResource( "org/hibernate/orm/test/annotations/configuration/orm.xml" ); + config.addPackage( "org.hibernate.orm/test.annotations.configuration" ); } catch( Exception e ) { Assert.fail( "Processing package first when ORM.xml is used should not fail" ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/configuration/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/configuration/package-info.java similarity index 85% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/configuration/package-info.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/configuration/package-info.java index b70ed6d9f7..24294a9ea4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/configuration/package-info.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/configuration/package-info.java @@ -5,6 +5,6 @@ * See the lgpl.txt file in the root directory or . */ @GenericGenerator(name = "myGenerator", strategy = "sequence") -package org.hibernate.test.annotations.configuration; +package org.hibernate.orm.test.annotations.configuration; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/Dependent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Dependent.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/Dependent.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Dependent.java index 30f22570d1..99c2f4b301 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/Dependent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Dependent.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e1.b; +package org.hibernate.orm.test.annotations.derivedidentities.e1.b; import javax.persistence.EmbeddedId; import javax.persistence.Entity; import javax.persistence.JoinColumn; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/DependentId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/DependentId.java similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/DependentId.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/DependentId.java index bc7c57826d..abf71d7b33 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/DependentId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/DependentId.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e1.b; +package org.hibernate.orm.test.annotations.derivedidentities.e1.b; import java.io.Serializable; import javax.persistence.Embeddable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/DerivedIdentitySimpleParentEmbeddedIdDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/DerivedIdentitySimpleParentEmbeddedIdDepTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/DerivedIdentitySimpleParentEmbeddedIdDepTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/DerivedIdentitySimpleParentEmbeddedIdDepTest.java index 398016b681..48a392062d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/DerivedIdentitySimpleParentEmbeddedIdDepTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/DerivedIdentitySimpleParentEmbeddedIdDepTest.java @@ -4,12 +4,12 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e1.b; +package org.hibernate.orm.test.annotations.derivedidentities.e1.b; import org.hibernate.Session; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Employee.java similarity index 85% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/Employee.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Employee.java index 34702aad3f..c162ce1790 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/Employee.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e1.c; +package org.hibernate.orm.test.annotations.derivedidentities.e1.b; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java index 1e76137ca0..9a4295cb9e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/ExclusiveDependent.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e1.b; +package org.hibernate.orm.test.annotations.derivedidentities.e1.b; import javax.persistence.EmbeddedId; import javax.persistence.Entity; import javax.persistence.JoinColumn; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Customer.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/Customer.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Customer.java index e830d010bb..0c0bcab3e7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Customer.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid; +package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid; import java.io.Serializable; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventory.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventory.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventory.java index 060cdd49e9..45eb7583c7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventory.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventory.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid; +package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid; import java.io.Serializable; import java.math.BigDecimal; import java.util.Comparator; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventoryPK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventoryPK.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventoryPK.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventoryPK.java index b6e365ffc6..a91076b6c6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventoryPK.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/CustomerInventoryPK.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid; +package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid; import java.io.Serializable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/IdMapManyToOneSpecjTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/IdMapManyToOneSpecjTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/IdMapManyToOneSpecjTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/IdMapManyToOneSpecjTest.java index fb99a18e38..9a10c8a181 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/IdMapManyToOneSpecjTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/IdMapManyToOneSpecjTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid; +package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid; import java.math.BigDecimal; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Item.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/Item.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Item.java index 060bd997c5..075bdb389d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/Item.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid; +package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid; import java.io.Serializable; import java.math.BigDecimal; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CompositeKeyDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CompositeKeyDeleteTest.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CompositeKeyDeleteTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CompositeKeyDeleteTest.java index 416b4e953e..c0b71c410f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CompositeKeyDeleteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CompositeKeyDeleteTest.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.lazy; +package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.lazy; import java.math.BigDecimal; import java.util.List; @@ -14,12 +14,18 @@ import junit.framework.Assert; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.Item; +import org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.Item; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; public class CompositeKeyDeleteTest extends BaseCoreFunctionalTestCase { + @Override + protected String getBaseForMappings() { + return "org/hibernate/orm/test/"; + } + + @Override public String[] getMappings() { return new String[] { "annotations/derivedidentities/e1/b/specjmapid/lazy/order_orm.xml" }; } diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwo.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwo.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwo.java index 5d92c40db4..93e4fbeb84 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwo.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwo.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.lazy; +package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.lazy; import java.io.Serializable; import java.math.BigDecimal; @@ -25,7 +25,7 @@ import javax.persistence.Table; import javax.persistence.TableGenerator; import javax.persistence.Version; -import org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.Item; +import org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.Item; @NamedQueries({ @NamedQuery(name = "CustomerInventoryTwo.selectAll", query = "select a from CustomerInventoryTwo a") }) @SuppressWarnings("serial") diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwoPK.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwoPK.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwoPK.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwoPK.java index 4498cf1b49..a461848cc8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwoPK.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwoPK.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.lazy; +package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.lazy; import java.io.Serializable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerTwo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerTwo.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerTwo.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerTwo.java index 20b1a21f9f..a36adbc439 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerTwo.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerTwo.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.lazy; +package org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.lazy; import java.io.Serializable; import java.math.BigDecimal; @@ -26,7 +26,7 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Version; -import org.hibernate.test.annotations.derivedidentities.e1.b.specjmapid.Item; +import org.hibernate.orm.test.annotations.derivedidentities.e1.b.specjmapid.Item; @SuppressWarnings("serial") @NamedQueries({ diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/hbm_order.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/hbm_order.xml similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/hbm_order.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/hbm_order.xml index f384af713a..346243d4e1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/hbm_order.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/hbm_order.xml @@ -11,7 +11,7 @@ - + @@ -31,7 +31,7 @@ - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/order_orm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/order_orm.xml similarity index 82% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/order_orm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/order_orm.xml index 5f8234423f..b3639c67fc 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/order_orm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/order_orm.xml @@ -1,39 +1,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/Dependent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Dependent.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/Dependent.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Dependent.java index 52133d816f..1bcd7e573e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/Dependent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Dependent.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e1.c; +package org.hibernate.orm.test.annotations.derivedidentities.e1.c; import java.io.Serializable; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/DerivedIdentitySimpleParentEmbeddedDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/DerivedIdentitySimpleParentEmbeddedDepTest.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/DerivedIdentitySimpleParentEmbeddedDepTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/DerivedIdentitySimpleParentEmbeddedDepTest.java index c830f50861..c622ab8f90 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/c/DerivedIdentitySimpleParentEmbeddedDepTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/DerivedIdentitySimpleParentEmbeddedDepTest.java @@ -4,12 +4,12 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e1.c; +package org.hibernate.orm.test.annotations.derivedidentities.e1.c; import org.hibernate.Session; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Employee.java similarity index 85% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/Employee.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Employee.java index 1b0ce16c09..293c742a5e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/c/Employee.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e1.b; +package org.hibernate.orm.test.annotations.derivedidentities.e1.c; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java index 8895cf54f4..650c96d178 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java @@ -4,14 +4,14 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e4.b; +package org.hibernate.orm.test.annotations.derivedidentities.e4.b; import java.util.Date; import org.hibernate.Session; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/FinancialHistory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/FinancialHistory.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/FinancialHistory.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/FinancialHistory.java index f3ef6a0432..2d503e7d3c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/FinancialHistory.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/FinancialHistory.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e4.b; +package org.hibernate.orm.test.annotations.derivedidentities.e4.b; import java.util.Date; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/MedicalHistory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/MedicalHistory.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/MedicalHistory.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/MedicalHistory.java index face0b9e25..25e8705c69 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/MedicalHistory.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/MedicalHistory.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e4.b; +package org.hibernate.orm.test.annotations.derivedidentities.e4.b; import java.util.Date; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/Person.java similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/Person.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/Person.java index 6a52470e0e..381e2a0985 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/b/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/Person.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e4.b; +package org.hibernate.orm.test.annotations.derivedidentities.e4.b; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/ForeignGeneratorViaMapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/ForeignGeneratorViaMapsIdTest.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/ForeignGeneratorViaMapsIdTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/ForeignGeneratorViaMapsIdTest.java index 8bb5bd83db..6243ce6cfe 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/ForeignGeneratorViaMapsIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/ForeignGeneratorViaMapsIdTest.java @@ -4,12 +4,12 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e5.c; +package org.hibernate.orm.test.annotations.derivedidentities.e5.c; import org.hibernate.Session; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/MedicalHistory.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/MedicalHistory.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/MedicalHistory.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/MedicalHistory.java index 3fa3f7ab34..59d72c0caf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/MedicalHistory.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/MedicalHistory.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e5.c; +package org.hibernate.orm.test.annotations.derivedidentities.e5.c; import java.io.Serializable; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/Person.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/Person.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/Person.java index 888b926d60..a168957e89 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/c/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/Person.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.derivedidentities.e5.c; +package org.hibernate.orm.test.annotations.derivedidentities.e5.c; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/duplicatedgenerator/DuplicateTest.java similarity index 77% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/duplicatedgenerator/DuplicateTest.java index 16d3f69834..e6458308d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/duplicatedgenerator/DuplicateTest.java @@ -6,13 +6,13 @@ */ //$Id$ -package org.hibernate.test.annotations.duplicatedgenerator; +package org.hibernate.orm.test.annotations.duplicatedgenerator; -import org.hibernate.AnnotationException; import org.hibernate.DuplicateMappingException; import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; +import org.hibernate.orm.test.annotations.Company; import org.hibernate.service.ServiceRegistry; import org.hibernate.testing.ServiceRegistryBuilder; @@ -31,10 +31,10 @@ public class DuplicateTest { SessionFactory sf = null; try { cfg.addAnnotatedClass( Flight.class ); - cfg.addAnnotatedClass( org.hibernate.test.annotations.Flight.class ); - cfg.addAnnotatedClass( org.hibernate.test.annotations.Company.class ); - cfg.addResource( "org/hibernate/test/annotations/orm.xml" ); - cfg.addResource( "org/hibernate/test/annotations/duplicatedgenerator/orm.xml" ); + cfg.addAnnotatedClass( org.hibernate.orm.test.annotations.Flight.class ); + cfg.addAnnotatedClass( Company.class ); + cfg.addResource( "org/hibernate/orm/test/annotations/orm.xml" ); + cfg.addResource( "org/hibernate/orm/test/annotations/duplicatedgenerator/orm.xml" ); serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( cfg.getProperties() ); sf = cfg.buildSessionFactory( serviceRegistry ); Assert.fail( "Should not be able to map the same entity name twice" ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/Flight.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/duplicatedgenerator/Flight.java similarity index 88% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/Flight.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/duplicatedgenerator/Flight.java index fdd131f736..065f4675be 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/Flight.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/duplicatedgenerator/Flight.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.duplicatedgenerator; +package org.hibernate.orm.test.annotations.duplicatedgenerator; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Address.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Address.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Address.java index d422b6877c..7bd340b62f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Address.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java index ba739ef60f..68e00a0916 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import java.math.BigDecimal; import java.util.ArrayList; @@ -32,6 +32,7 @@ import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.ServiceRegistryBuilder; import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.junit.Ignore; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -44,6 +45,8 @@ import static org.junit.Assert.fail; /** * @author Emmanuel Bernard */ +// todo (6.0): needs a composite user type mechanism e.g. by providing a custom ComponentTuplizer/Instantiator +@Ignore( "Missing support for composite user types" ) public class BasicHibernateAnnotationsTest extends BaseCoreFunctionalTestCase { @Override protected boolean isCleanupTestDataRequired() { @@ -665,7 +668,7 @@ public class BasicHibernateAnnotationsTest extends BaseCoreFunctionalTestCase { public void testFormula() throws Exception { Session s = openSession(); Transaction tx = s.beginTransaction(); - org.hibernate.test.annotations.entity.Flight airFrance = new Flight(); + Flight airFrance = new Flight(); airFrance.setId( new Long( 747 ) ); airFrance.setMaxAltitude( 10000 ); s.persist( airFrance ); @@ -795,7 +798,7 @@ public class BasicHibernateAnnotationsTest extends BaseCoreFunctionalTestCase { @Override protected String[] getAnnotatedPackages() { return new String[]{ - "org.hibernate.test.annotations.entity" + "org.hibernate.orm.test.annotations.entity" }; } diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Bid.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Bid.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Bid.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Bid.java index 8439cde397..db1d4a81a2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Bid.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Bid.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.Entity; import javax.persistence.EnumType; import javax.persistence.Enumerated; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Car.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Car.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Car.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Car.java index 9d1255a155..c0627e5416 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Car.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Car.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/CasterStringType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/CasterStringType.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/CasterStringType.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/CasterStringType.java index a4072a0123..f5359b0c70 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/CasterStringType.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/CasterStringType.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import java.io.Serializable; import java.sql.PreparedStatement; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/CommunityBid.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/CommunityBid.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/CommunityBid.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/CommunityBid.java index 1e8b615100..68ac3581f3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/CommunityBid.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/CommunityBid.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.Entity; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/ContactDetails.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ContactDetails.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/ContactDetails.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ContactDetails.java index cd88f77ace..1d75fc2ea0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/ContactDetails.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ContactDetails.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Country.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Country.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Country.java index c9a4e9bd18..ac4a476698 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Country.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Country.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import java.io.Serializable; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Doctor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Doctor.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Doctor.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Doctor.java index 3fde4df755..e8b4df1e5e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Doctor.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Doctor.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.Entity; import javax.persistence.EnumType; import javax.persistence.Enumerated; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Drill.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Drill.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Drill.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Drill.java index 277a19fbaa..df5fb02f76 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Drill.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Drill.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.DiscriminatorColumn; import javax.persistence.DiscriminatorType; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/FirstName.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FirstName.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/FirstName.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FirstName.java index e1a2f189a3..852f5f06ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/FirstName.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FirstName.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.MappedSuperclass; import org.hibernate.annotations.Parameter; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Flight.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Flight.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Flight.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Flight.java index b0ade1bb6d..8b75eccdfe 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Flight.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Flight.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import java.io.Serializable; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Forest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Forest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest.java index 9591224d1b..52bddc4d82 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Forest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import java.util.Set; import javax.persistence.ElementCollection; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Forest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest2.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Forest2.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest2.java index 21e43eb493..98f20a6bdf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Forest2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest2.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/FormalLastName.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FormalLastName.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/FormalLastName.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FormalLastName.java index f6a8bf5c4c..9b855bfd92 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/FormalLastName.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/FormalLastName.java @@ -7,7 +7,7 @@ //$Id: BasicHibernateAnnotationsTest.java 17531 2009-09-22 17:43:48Z epbernard $ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.Embedded; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/HibernateAnnotationMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/HibernateAnnotationMappingTest.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/HibernateAnnotationMappingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/HibernateAnnotationMappingTest.java index 33cd1755b1..91fe5a6ebf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/HibernateAnnotationMappingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/HibernateAnnotationMappingTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import static org.junit.Assert.fail; @@ -27,7 +27,7 @@ public class HibernateAnnotationMappingTest extends BaseUnitTestCase { public void testUniqueConstraintAnnotationOnNaturalIds() throws Exception { Configuration configuration = new Configuration(); configuration.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); - configuration.addAnnotatedClass(Month.class); + configuration.addAnnotatedClass( Month.class); SessionFactory sf = null; try { sf = configuration.buildSessionFactory(); diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Java5FeaturesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Java5FeaturesTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Java5FeaturesTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Java5FeaturesTest.java index 5069fb5f58..2f2058b0c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Java5FeaturesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Java5FeaturesTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/LastName.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LastName.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/LastName.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LastName.java index 3bf134a4f3..933a692d48 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/LastName.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LastName.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.Embeddable; import org.hibernate.annotations.Parameter; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Length.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Length.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Length.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Length.java index 269511c800..6647eaf843 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Length.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Length.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/LocalContactDetails.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LocalContactDetails.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/LocalContactDetails.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LocalContactDetails.java index 567a615fac..7a3840c16f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/LocalContactDetails.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/LocalContactDetails.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/MonetaryAmount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/MonetaryAmount.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/MonetaryAmount.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/MonetaryAmount.java index f54b4c8ad7..b126e3a477 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/MonetaryAmount.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/MonetaryAmount.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import java.io.Serializable; import java.math.BigDecimal; import java.util.Currency; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Month.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Month.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Month.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Month.java index 28bc0f1b5e..2287377543 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Month.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Month.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Name.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Name.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Name.java index 3cfd8ecfd0..fe2408bcf0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Name.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Name.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.Embedded; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Narrative.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Narrative.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Narrative.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Narrative.java index aa74d68ee4..9ce0f1ede9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Narrative.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Narrative.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/NewCustomEntityMappingAnnotationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/NewCustomEntityMappingAnnotationsTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/NewCustomEntityMappingAnnotationsTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/NewCustomEntityMappingAnnotationsTest.java index 5856df8cdc..7690608532 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/NewCustomEntityMappingAnnotationsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/NewCustomEntityMappingAnnotationsTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/OverseasPhoneNumber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/OverseasPhoneNumber.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/OverseasPhoneNumber.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/OverseasPhoneNumber.java index fd3fdc402c..60304820c5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/OverseasPhoneNumber.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/OverseasPhoneNumber.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Peugot.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Peugot.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Peugot.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Peugot.java index 93b3e9f2d2..9182f5d709 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Peugot.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Peugot.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.Entity; import org.hibernate.annotations.Parameter; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/PhoneNumber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumber.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/PhoneNumber.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumber.java index 7062965a66..6b2b8bf9dd 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/PhoneNumber.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumber.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import java.io.Serializable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/PhoneNumberType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumberType.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/PhoneNumberType.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumberType.java index 256e1cf614..2b5608c269 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/PhoneNumberType.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PhoneNumberType.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import java.io.Serializable; import java.sql.PreparedStatement; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Player.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Player.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Player.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Player.java index 25cd299f16..938bb4d5e1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Player.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Player.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/PowerDrill.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PowerDrill.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/PowerDrill.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PowerDrill.java index b3db8f8026..106f89cd62 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/PowerDrill.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PowerDrill.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PropertyDefaultMappingsTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PropertyDefaultMappingsTest.java index 351c275c9b..8a506e4e84 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PropertyDefaultMappingsTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Race.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Race.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Race.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Race.java index ed323be526..a995d5f751 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Race.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Race.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Ransom.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Ransom.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Ransom.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Ransom.java index 5220b3c5b3..6bbdd0a763 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Ransom.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Ransom.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/SoccerTeam.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/SoccerTeam.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/SoccerTeam.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/SoccerTeam.java index 98a052ea24..1fda6a8cc5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/SoccerTeam.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/SoccerTeam.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Starred.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Starred.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Starred.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Starred.java index 79566ef93e..ec7554f40a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Starred.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Starred.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Tool.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tool.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Tool.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tool.java index 5eb177b21f..2deb662ed2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Tool.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tool.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.Column; import javax.persistence.MappedSuperclass; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Topic.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Topic.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Topic.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Topic.java index a06014640d..8a5834d821 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Topic.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Topic.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import java.util.HashSet; import java.util.Set; import javax.persistence.CascadeType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Tree.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tree.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Tree.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tree.java index 2e00493061..27ba77c9a7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Tree.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Tree.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/WashingMachine.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/WashingMachine.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/WashingMachine.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/WashingMachine.java index 0494ea2413..0986ea042c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/WashingMachine.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/WashingMachine.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Widget.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Widget.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Widget.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Widget.java index 851630eb4c..6268772fdb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Widget.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Widget.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.MappedSuperclass; import org.hibernate.annotations.Filter; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/ZipCode.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ZipCode.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/ZipCode.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ZipCode.java index bf12d1deff..9470df7c90 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/ZipCode.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/ZipCode.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entity; +package org.hibernate.orm.test.annotations.entity; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/package-info.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entity/package-info.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/package-info.java index 9512ccd811..b4d4225038 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/package-info.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/package-info.java @@ -23,7 +23,7 @@ parameters = { @Parameter(name = "cast", value = "lower") } -) package org.hibernate.test.annotations.entity; +) package org.hibernate.orm.test.annotations.entity; import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.ParamDef; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Cellular.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Cellular.java similarity index 84% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Cellular.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Cellular.java index 143852c8f3..62842a00ee 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Cellular.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Cellular.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entitynonentity; +package org.hibernate.orm.test.annotations.entitynonentity; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Communication.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Communication.java similarity index 85% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Communication.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Communication.java index 92866f7d98..33ad7714e5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Communication.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Communication.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entitynonentity; +package org.hibernate.orm.test.annotations.entitynonentity; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/EntityNonEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/EntityNonEntityTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java index 66628fd3cd..dd86beaf21 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/EntityNonEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.entitynonentity; +package org.hibernate.orm.test.annotations.entitynonentity; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/GSM.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/GSM.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/GSM.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/GSM.java index 4a319f4bea..9ee9a9a7b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/GSM.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/GSM.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entitynonentity; +package org.hibernate.orm.test.annotations.entitynonentity; import javax.persistence.Entity; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Interaction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Interaction.java similarity index 88% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Interaction.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Interaction.java index f4ac4879aa..6ee6125cdc 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Interaction.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Interaction.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entitynonentity; +package org.hibernate.orm.test.annotations.entitynonentity; import javax.persistence.Column; import javax.persistence.MappedSuperclass; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Phone.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Phone.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Phone.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Phone.java index 7d3e03541f..cb24b299f4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Phone.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Phone.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entitynonentity; +package org.hibernate.orm.test.annotations.entitynonentity; import javax.persistence.MappedSuperclass; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Voice.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Voice.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Voice.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Voice.java index 6644c02694..ca48e67689 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Voice.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/Voice.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.entitynonentity; +package org.hibernate.orm.test.annotations.entitynonentity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mapkey/MapKeyEnumeratedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/MapKeyEnumeratedTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mapkey/MapKeyEnumeratedTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/MapKeyEnumeratedTest.java index c1edcc4a4b..1585cceae9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mapkey/MapKeyEnumeratedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/MapKeyEnumeratedTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.enumerated.mapkey; +package org.hibernate.orm.test.annotations.enumerated.mapkey; import org.hibernate.Session; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mapkey/SocialNetwork.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/SocialNetwork.java similarity index 84% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mapkey/SocialNetwork.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/SocialNetwork.java index fb0f74c498..8ba604aaab 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mapkey/SocialNetwork.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/SocialNetwork.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.enumerated.mapkey; +package org.hibernate.orm.test.annotations.enumerated.mapkey; /** * @author Dmitry Spikhalskiy diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mapkey/SocialNetworkProfile.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/SocialNetworkProfile.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mapkey/SocialNetworkProfile.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/SocialNetworkProfile.java index 42005b8ced..8777132b68 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mapkey/SocialNetworkProfile.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/SocialNetworkProfile.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.enumerated.mapkey; +package org.hibernate.orm.test.annotations.enumerated.mapkey; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mapkey/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/User.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mapkey/User.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/User.java index d9a0bab876..6b9066526d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mapkey/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/User.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.enumerated.mapkey; +package org.hibernate.orm.test.annotations.enumerated.mapkey; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mappedSuperclass/EnumeratedWithMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mappedSuperclass/EnumeratedWithMappedSuperclassTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mappedSuperclass/EnumeratedWithMappedSuperclassTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mappedSuperclass/EnumeratedWithMappedSuperclassTest.java index d3e700203a..5601038345 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mappedSuperclass/EnumeratedWithMappedSuperclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mappedSuperclass/EnumeratedWithMappedSuperclassTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.enumerated.mappedSuperclass; +package org.hibernate.orm.test.annotations.enumerated.mappedSuperclass; import java.io.Serializable; import java.sql.Types; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/ormXml/Binding.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/Binding.java similarity index 84% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/ormXml/Binding.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/Binding.java index 5fac153c28..a2ee883917 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/ormXml/Binding.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/Binding.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.enumerated.ormXml; +package org.hibernate.orm.test.annotations.enumerated.ormXml; /** * @author Oliverio diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/ormXml/BookWithOrmEnum.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/BookWithOrmEnum.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/ormXml/BookWithOrmEnum.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/BookWithOrmEnum.java index 774410a6f4..c22e523c1d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/ormXml/BookWithOrmEnum.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/BookWithOrmEnum.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.enumerated.ormXml; +package org.hibernate.orm.test.annotations.enumerated.ormXml; /** * @author Oliverio diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/ormXml/OrmXmlEnumTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/OrmXmlEnumTypeTest.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/ormXml/OrmXmlEnumTypeTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/OrmXmlEnumTypeTest.java index fde3804b0c..f16d1ca287 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/ormXml/OrmXmlEnumTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/OrmXmlEnumTypeTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.enumerated.ormXml; +package org.hibernate.orm.test.annotations.enumerated.ormXml; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; @@ -32,7 +32,7 @@ public class OrmXmlEnumTypeTest extends BaseUnitTestCase { try { MetadataSources ms = new MetadataSources( ssr ); - ms.addResource( "org/hibernate/test/annotations/enumerated/ormXml/orm.xml" ); + ms.addResource( "org/hibernate/orm/test/annotations/enumerated/ormXml/orm.xml" ); Metadata metadata = ms.buildMetadata(); diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Country.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Country.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Country.java index 70f1b2b4d2..35a23883f3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Country.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Country.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.fetchprofile; +package org.hibernate.orm.test.annotations.fetchprofile; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer.java index 47a5ae9bd1..90f2f06b61 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer.java @@ -7,7 +7,7 @@ // $Id$ -package org.hibernate.test.annotations.fetchprofile; +package org.hibernate.orm.test.annotations.fetchprofile; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer2.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer2.java index 94e4617009..af779e91ec 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer2.java @@ -7,7 +7,7 @@ // $Id$ -package org.hibernate.test.annotations.fetchprofile; +package org.hibernate.orm.test.annotations.fetchprofile; import java.util.Set; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer3.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer3.java index 891f7978f9..5436a99ebb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer3.java @@ -7,7 +7,7 @@ // $Id$ -package org.hibernate.test.annotations.fetchprofile; +package org.hibernate.orm.test.annotations.fetchprofile; import java.util.Set; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer4.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer4.java index 1e03e9815f..222bfd211b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer4.java @@ -7,7 +7,7 @@ // $Id$ -package org.hibernate.test.annotations.fetchprofile; +package org.hibernate.orm.test.annotations.fetchprofile; import java.util.Set; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer5.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer5.java index 8ad7bb96fd..53cbd37eea 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer5.java @@ -7,7 +7,7 @@ // $Id$ -package org.hibernate.test.annotations.fetchprofile; +package org.hibernate.orm.test.annotations.fetchprofile; import java.util.Set; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer6.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer6.java similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer6.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer6.java index 11e3f6141e..01a768465f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer6.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Customer6.java @@ -1,8 +1,8 @@ -package org.hibernate.test.annotations.fetchprofile; +package org.hibernate.orm.test.annotations.fetchprofile; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchProfile; -import org.hibernate.test.annotations.fetchprofile.mappedby.Address; +import org.hibernate.orm.test.annotations.fetchprofile.mappedby.Address; import javax.persistence.Entity; import javax.persistence.FetchType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/FetchProfileTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/FetchProfileTest.java index 5b507892d7..4c9f495733 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/FetchProfileTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.fetchprofile; +package org.hibernate.orm.test.annotations.fetchprofile; import java.io.InputStream; @@ -24,8 +24,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -146,7 +144,7 @@ public class FetchProfileTest extends BaseUnitTestCase { config.addAnnotatedClass( Country.class ); InputStream is = Thread.currentThread() .getContextClassLoader() - .getResourceAsStream( "org/hibernate/test/annotations/fetchprofile/mappings.hbm.xml" ); + .getResourceAsStream( "org/hibernate/orm/test/annotations/fetchprofile/mappings.hbm.xml" ); config.addInputStream( is ); SessionFactoryImplementor sessionImpl = ( SessionFactoryImplementor ) config.buildSessionFactory( serviceRegistry diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/MappedByFetchProfileFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileFunctionTest.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/MappedByFetchProfileFunctionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileFunctionTest.java index d7544c9ed1..5369f96f33 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/MappedByFetchProfileFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileFunctionTest.java @@ -1,9 +1,10 @@ -package org.hibernate.test.annotations.fetchprofile; +package org.hibernate.orm.test.annotations.fetchprofile; import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.test.annotations.fetchprofile.mappedby.Address; +import org.hibernate.orm.test.annotations.fetchprofile.mappedby.Address; + import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/MappedByFetchProfileUnitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileUnitTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/MappedByFetchProfileUnitTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileUnitTest.java index c3955ecca3..4b0cddcfec 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/MappedByFetchProfileUnitTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileUnitTest.java @@ -1,10 +1,11 @@ -package org.hibernate.test.annotations.fetchprofile; +package org.hibernate.orm.test.annotations.fetchprofile; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.orm.test.annotations.fetchprofile.mappedby.Address; import org.hibernate.service.ServiceRegistry; -import org.hibernate.test.annotations.fetchprofile.mappedby.Address; + import org.hibernate.testing.ServiceRegistryBuilder; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseUnitTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/MoreFetchProfileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MoreFetchProfileTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/MoreFetchProfileTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MoreFetchProfileTest.java index f7ade12f0e..55d39cb30e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/MoreFetchProfileTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MoreFetchProfileTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.fetchprofile; +package org.hibernate.orm.test.annotations.fetchprofile; import java.util.Date; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Order.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Order.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Order.java index fc4881dba5..cafce5e3d5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Order.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/Order.java @@ -7,7 +7,7 @@ // $Id$ -package org.hibernate.test.annotations.fetchprofile; +package org.hibernate.orm.test.annotations.fetchprofile; import java.util.Date; import javax.persistence.Entity; import javax.persistence.FetchType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/SupportTickets.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/SupportTickets.java index dd245c1c32..086f139d6c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/SupportTickets.java @@ -7,7 +7,7 @@ // $Id$ -package org.hibernate.test.annotations.fetchprofile; +package org.hibernate.orm.test.annotations.fetchprofile; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/mappedby/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/mappedby/Address.java similarity index 88% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/mappedby/Address.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/mappedby/Address.java index 513e8378b3..5c81b00a5e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/mappedby/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/mappedby/Address.java @@ -1,8 +1,8 @@ -package org.hibernate.test.annotations.fetchprofile.mappedby; +package org.hibernate.orm.test.annotations.fetchprofile.mappedby; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchProfile; -import org.hibernate.test.annotations.fetchprofile.Customer6; +import org.hibernate.orm.test.annotations.fetchprofile.Customer6; import javax.persistence.Entity; import javax.persistence.FetchType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/mappedby/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/mappedby/package-info.java similarity index 77% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/mappedby/package-info.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/mappedby/package-info.java index d8fec20121..a3708d5027 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/mappedby/package-info.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/mappedby/package-info.java @@ -4,8 +4,8 @@ @FetchProfile(name = "mappedBy-package-profile-2", fetchOverrides = { @FetchProfile.FetchOverride(entity = Customer6.class, association = "address", mode = FetchMode.JOIN) }) -package org.hibernate.test.annotations.fetchprofile.mappedby; +package org.hibernate.orm.test.annotations.fetchprofile.mappedby; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchProfile; -import org.hibernate.test.annotations.fetchprofile.Customer6; +import org.hibernate.orm.test.annotations.fetchprofile.Customer6; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/package-info.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/package-info.java index 00a4247e17..c3bbaff847 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/package-info.java @@ -13,7 +13,7 @@ @FetchProfile(name = "package-profile-2", fetchOverrides = { @FetchProfile.FetchOverride(entity = Customer.class, association = "tickets", mode = FetchMode.JOIN) }) -package org.hibernate.test.annotations.fetchprofile; +package org.hibernate.orm.test.annotations.fetchprofile; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchProfile; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdTest.java index 96a75679f2..c04e8988e9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdTest.java @@ -50,7 +50,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; "org.hibernate.orm.test.annotations", "org.hibernate.orm.test.annotations.id" }, - xmlMappings = "org/hibernate/test/annotations/orm.xml" + xmlMappings = "org/hibernate/orm/test/annotations/orm.xml" ) @SessionFactory public class IdTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdTest.java index 6d92d9f702..0bccb69d61 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdTest.java @@ -57,7 +57,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; "org.hibernate.orm.test.annotations.id", "org.hibernate.orm.test.annotations.id.generationmappings" }, - xmlMappings = "org/hibernate/test/annotations/orm.xml" + xmlMappings = "org/hibernate/orm/test/annotations/orm.xml" ) @SessionFactory diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/index/jpa/AbstractJPAIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/AbstractJPAIndexTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/index/jpa/AbstractJPAIndexTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/AbstractJPAIndexTest.java index 9f9a26d4af..ee540e1cc6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/index/jpa/AbstractJPAIndexTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/AbstractJPAIndexTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.index.jpa; +package org.hibernate.orm.test.annotations.index.jpa; import java.util.Iterator; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/index/jpa/Car.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Car.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/index/jpa/Car.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Car.java index 2f06c9871b..a9ec75cd84 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/index/jpa/Car.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Car.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.index.jpa; +package org.hibernate.orm.test.annotations.index.jpa; import java.util.List; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/index/jpa/Dealer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Dealer.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/index/jpa/Dealer.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Dealer.java index 1dbfa89ffa..c9e225492a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/index/jpa/Dealer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Dealer.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.index.jpa; +package org.hibernate.orm.test.annotations.index.jpa; import java.io.Serializable; import javax.persistence.Embeddable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/index/jpa/Importer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Importer.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/index/jpa/Importer.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Importer.java index 91f3fd3993..2a0343df90 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/index/jpa/Importer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/Importer.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.index.jpa; +package org.hibernate.orm.test.annotations.index.jpa; import java.util.List; import javax.persistence.CascadeType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/index/jpa/IndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/IndexTest.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/index/jpa/IndexTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/IndexTest.java index 2da6601d4b..562d0d3c4c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/index/jpa/IndexTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/IndexTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.index.jpa; +package org.hibernate.orm.test.annotations.index.jpa; /** * @author Strong Liu diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/index/jpa/OrmXmlIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/OrmXmlIndexTest.java similarity index 74% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/index/jpa/OrmXmlIndexTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/OrmXmlIndexTest.java index 792fae6b88..13825f70a9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/index/jpa/OrmXmlIndexTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/OrmXmlIndexTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.index.jpa; +package org.hibernate.orm.test.annotations.index.jpa; /** @@ -13,6 +13,6 @@ package org.hibernate.test.annotations.index.jpa; public class OrmXmlIndexTest extends AbstractJPAIndexTest { @Override protected String[] getXmlFiles() { - return new String[] { "org/hibernate/test/annotations/index/jpa/orm-index.xml" }; + return new String[] { "org/hibernate/orm/test/annotations/index/jpa/orm-index.xml" }; } } diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/eager/Atmosphere.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/Atmosphere.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/eager/Atmosphere.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/Atmosphere.java index 2ffd8d0ab6..88209e4743 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/eager/Atmosphere.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/Atmosphere.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.indexcoll.eager; +package org.hibernate.orm.test.annotations.indexcoll.eager; import java.util.Date; import java.util.HashMap; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/eager/EagerIndexedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/EagerIndexedCollectionTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/eager/EagerIndexedCollectionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/EagerIndexedCollectionTest.java index f7f7032d68..fc174929de 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/eager/EagerIndexedCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/EagerIndexedCollectionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.indexcoll.eager; +package org.hibernate.orm.test.annotations.indexcoll.eager; import java.util.Date; import java.util.Iterator; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/A.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/join/A.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/A.java index 276166e551..0fbca29ed3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/A.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.join; +package org.hibernate.orm.test.annotations.join; import java.util.Date; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/B.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/join/B.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/B.java index d9445365ad..05358417fb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/B.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/B.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.join; +package org.hibernate.orm.test.annotations.join; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/C.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/C.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/join/C.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/C.java index 4d29f2ae85..34fd68e67b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/C.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/C.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.join; +package org.hibernate.orm.test.annotations.join; import javax.persistence.Column; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/Cat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Cat.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/join/Cat.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Cat.java index d51cab461e..ab63598c8a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/Cat.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Cat.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.join; +package org.hibernate.orm.test.annotations.join; import java.io.Serializable; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/Death.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Death.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/join/Death.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Death.java index 6afd56e014..8aab1d0b00 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/Death.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Death.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.join; +package org.hibernate.orm.test.annotations.join; import java.io.Serializable; import java.util.Date; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/Dog.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Dog.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/join/Dog.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Dog.java index 530e1405bc..68ad3b1f02 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/Dog.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Dog.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.join; +package org.hibernate.orm.test.annotations.join; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/DogPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/DogPk.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/join/DogPk.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/DogPk.java index b8139db481..8c93feb564 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/DogPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/DogPk.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.join; +package org.hibernate.orm.test.annotations.join; import java.io.Serializable; import javax.persistence.Embeddable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/JoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/join/JoinTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java index 618e28e710..6673f07ac9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/JoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.join; +package org.hibernate.orm.test.annotations.join; import javax.persistence.PersistenceException; import javax.persistence.criteria.CriteriaBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/Life.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Life.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/join/Life.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Life.java index 2288be7977..4e352ef525 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/Life.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Life.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.join; +package org.hibernate.orm.test.annotations.join; import java.io.Serializable; import javax.persistence.CascadeType; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/SysGroupsOrm.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysGroupsOrm.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/join/SysGroupsOrm.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysGroupsOrm.java index f315bfaf59..0afa7ad1f9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/SysGroupsOrm.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysGroupsOrm.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.join; +package org.hibernate.orm.test.annotations.join; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/SysUserOrm.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysUserOrm.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/join/SysUserOrm.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysUserOrm.java index 76c35b1a28..51380b9d8d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/SysUserOrm.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/SysUserOrm.java @@ -1,49 +1,49 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.test.annotations.join; -import java.util.Collection; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Table; - -@Entity( name = "sys_user" ) -@Table( name = "`SYS_USER`" ) -public class SysUserOrm { - - private long userid; - - private Collection groups; - - @Id - @GeneratedValue - @Column( name = "`auid`" ) - public long getUserid() { - return userid; - } - - public void setUserid( long userid ) { - this.userid = userid; - } - - @ManyToMany( fetch = FetchType.LAZY ) - @JoinTable( name = "SYS_GROUPS_USERS", - joinColumns = @JoinColumn( name = "USERID", referencedColumnName = "`auid`" ), - inverseJoinColumns = @JoinColumn( name = "GROUPID", referencedColumnName = "GROUPID" ) ) - public Collection getGroups() { - return groups; - } - - public void setGroups( Collection groups ) { - this.groups = groups; - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.orm.test.annotations.join; +import java.util.Collection; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; +import javax.persistence.Table; + +@Entity( name = "sys_user" ) +@Table( name = "`SYS_USER`" ) +public class SysUserOrm { + + private long userid; + + private Collection groups; + + @Id + @GeneratedValue + @Column( name = "`auid`" ) + public long getUserid() { + return userid; + } + + public void setUserid( long userid ) { + this.userid = userid; + } + + @ManyToMany( fetch = FetchType.LAZY ) + @JoinTable( name = "SYS_GROUPS_USERS", + joinColumns = @JoinColumn( name = "USERID", referencedColumnName = "`auid`" ), + inverseJoinColumns = @JoinColumn( name = "GROUPID", referencedColumnName = "GROUPID" ) ) + public Collection getGroups() { + return groups; + } + + public void setGroups( Collection groups ) { + this.groups = groups; + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/namingstrategy/Life.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/Life.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/join/namingstrategy/Life.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/Life.java index 0147d0f61e..a04ef7e77a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/namingstrategy/Life.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/Life.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.join.namingstrategy; +package org.hibernate.orm.test.annotations.join.namingstrategy; import javax.persistence.CascadeType; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/namingstrategy/NamingStrategyJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/NamingStrategyJoinTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/join/namingstrategy/NamingStrategyJoinTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/NamingStrategyJoinTest.java index 27d67a96ac..fa68af6e6b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/namingstrategy/NamingStrategyJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/NamingStrategyJoinTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.join.namingstrategy; +package org.hibernate.orm.test.annotations.join.namingstrategy; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/namingstrategy/SimpleCat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/SimpleCat.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/join/namingstrategy/SimpleCat.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/SimpleCat.java index 18d0905118..027dbca133 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/namingstrategy/SimpleCat.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/SimpleCat.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.join.namingstrategy; +package org.hibernate.orm.test.annotations.join.namingstrategy; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/namingstrategy/TestNamingStrategy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/TestNamingStrategy.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/join/namingstrategy/TestNamingStrategy.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/TestNamingStrategy.java index 928d7690d8..2778acfd64 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/join/namingstrategy/TestNamingStrategy.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/namingstrategy/TestNamingStrategy.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.join.namingstrategy; +package org.hibernate.orm.test.annotations.join.namingstrategy; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/locator/LobHolder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/locator/LobHolder.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/lob/locator/LobHolder.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/locator/LobHolder.java index 63c7d1641d..1fab958573 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/locator/LobHolder.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/locator/LobHolder.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.lob.locator; +package org.hibernate.orm.test.annotations.lob.locator; import java.sql.Blob; import java.sql.Clob; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/locator/LobLocatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/locator/LobLocatorTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/lob/locator/LobLocatorTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/locator/LobLocatorTest.java index c0549163aa..cd1b8c32c1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/locator/LobLocatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/locator/LobLocatorTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.lob.locator; +package org.hibernate.orm.test.annotations.lob.locator; import java.sql.SQLException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Category.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/Category.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Category.java index 91124b9a29..629fa4f4e8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/Category.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Category.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.manytomany.defaults; +package org.hibernate.orm.test.annotations.manytomany.defaults; import java.util.Set; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/City.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/City.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/City.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/City.java index ccc87f6f84..55bb2f7117 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/City.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/City.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.manytomany.defaults; +package org.hibernate.orm.test.annotations.manytomany.defaults; import java.util.Set; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/ContactInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/ContactInfo.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/ContactInfo.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/ContactInfo.java index 4df517d9dc..4e59e4a883 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/ContactInfo.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/ContactInfo.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.manytomany.defaults; +package org.hibernate.orm.test.annotations.manytomany.defaults; import java.util.List; import javax.persistence.CascadeType; import javax.persistence.Embeddable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Employee.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/Employee.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Employee.java index e8cdd5204a..5f2bf46469 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Employee.java @@ -6,10 +6,8 @@ */ //$Id$ -package org.hibernate.test.annotations.manytomany.defaults; +package org.hibernate.orm.test.annotations.manytomany.defaults; import java.io.Serializable; -import java.util.Collection; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; @@ -17,9 +15,6 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; -import javax.persistence.ManyToMany; - -import org.hibernate.annotations.Cascade; /** * Employee in an Employer-Employee relationship diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Item.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/Item.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Item.java index a91c8fa50b..3f968bc9c6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Item.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.manytomany.defaults; +package org.hibernate.orm.test.annotations.manytomany.defaults; import java.util.Set; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/JpaCompliantManyToManyImplicitNamingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/JpaCompliantManyToManyImplicitNamingTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/JpaCompliantManyToManyImplicitNamingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/JpaCompliantManyToManyImplicitNamingTest.java index 55d2efdf9d..05dadbaf45 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/JpaCompliantManyToManyImplicitNamingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/JpaCompliantManyToManyImplicitNamingTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.manytomany.defaults; +package org.hibernate.orm.test.annotations.manytomany.defaults; import org.hibernate.boot.MetadataBuilder; import org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/KnownClient.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/KnownClient.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/KnownClient.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/KnownClient.java index 1025a4df82..11a4a5e539 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/KnownClient.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/KnownClient.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.manytomany.defaults; +package org.hibernate.orm.test.annotations.manytomany.defaults; import java.util.Set; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/ManyToManyImplicitNamingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/ManyToManyImplicitNamingTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/ManyToManyImplicitNamingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/ManyToManyImplicitNamingTest.java index 1399e1c461..7ee4e75228 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/ManyToManyImplicitNamingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/ManyToManyImplicitNamingTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.manytomany.defaults; +package org.hibernate.orm.test.annotations.manytomany.defaults; import java.util.Iterator; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/PhoneNumber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/PhoneNumber.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/PhoneNumber.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/PhoneNumber.java index 9f799c5e0c..2a0ad706d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/PhoneNumber.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/PhoneNumber.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.manytomany.defaults; +package org.hibernate.orm.test.annotations.manytomany.defaults; import java.util.Collection; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/Store.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Store.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/Store.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Store.java index 7a05a6e206..10d43ed4f1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/Store.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/defaults/Store.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.manytomany.defaults; +package org.hibernate.orm.test.annotations.manytomany.defaults; import java.util.Set; import javax.persistence.CascadeType; @@ -14,8 +14,6 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; import javax.persistence.ManyToMany; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/NotNullManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotNullManyToOneTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/NotNullManyToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotNullManyToOneTest.java index 818f2454af..628349605e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/NotNullManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotNullManyToOneTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.annotations.manytoone; +package org.hibernate.orm.test.annotations.manytoone; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/A.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/A.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/A.java index b8e3d916fd..d25e3a4dc4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/A.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/A.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.namingstrategy; +package org.hibernate.orm.test.annotations.namingstrategy; import java.util.HashSet; import java.util.Set; import javax.persistence.ElementCollection; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Address.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Address.java index 62c157794f..d252e5f953 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Address.java @@ -6,7 +6,7 @@ */ // $Id$ -package org.hibernate.test.annotations.namingstrategy; +package org.hibernate.orm.test.annotations.namingstrategy; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.JoinTable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/AddressEntry.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/AddressEntry.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/AddressEntry.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/AddressEntry.java index 41c365a76e..35938f5fd2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/AddressEntry.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/AddressEntry.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.namingstrategy; +package org.hibernate.orm.test.annotations.namingstrategy; import javax.persistence.Embeddable; @Embeddable diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/DummyNamingStrategy.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/DummyNamingStrategy.java index dbeaabcd83..605c70a496 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/DummyNamingStrategy.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.namingstrategy; +package org.hibernate.orm.test.annotations.namingstrategy; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/LongIdentifierNamingStrategy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongIdentifierNamingStrategy.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/LongIdentifierNamingStrategy.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongIdentifierNamingStrategy.java index f37d1fff17..2249225e62 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/LongIdentifierNamingStrategy.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongIdentifierNamingStrategy.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.namingstrategy; +package org.hibernate.orm.test.annotations.namingstrategy; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.boot.model.naming.ImplicitForeignKeyNameSource; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/LongKeyNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongKeyNamingStrategyTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/LongKeyNamingStrategyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongKeyNamingStrategyTest.java index 7fd014a440..4544427758 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/LongKeyNamingStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongKeyNamingStrategyTest.java @@ -6,7 +6,7 @@ */ // $Id$ -package org.hibernate.test.annotations.namingstrategy; +package org.hibernate.orm.test.annotations.namingstrategy; import javax.persistence.Entity; import javax.persistence.ForeignKey; @@ -30,8 +30,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.junit.Assert.assertEquals; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/NamingStrategyTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/NamingStrategyTest.java index 43f8409c71..9c16951b16 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/NamingStrategyTest.java @@ -6,7 +6,7 @@ */ // $Id$ -package org.hibernate.test.annotations.namingstrategy; +package org.hibernate.orm.test.annotations.namingstrategy; import java.util.Locale; import org.hibernate.boot.Metadata; @@ -27,8 +27,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.junit.Assert.assertEquals; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Person.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Person.java index fea98cacac..a2d54ddd17 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/Person.java @@ -6,7 +6,7 @@ */ // $Id$ -package org.hibernate.test.annotations.namingstrategy; +package org.hibernate.orm.test.annotations.namingstrategy; import java.util.HashSet; import java.util.Set; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java index 044b569e65..949e22bfc5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java @@ -6,7 +6,7 @@ */ // $Id$ -package org.hibernate.test.annotations.namingstrategy.charset; +package org.hibernate.orm.test.annotations.namingstrategy.charset; import java.util.HashMap; import java.util.Map; @@ -27,7 +27,7 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.testing.ServiceRegistryBuilder; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.annotations.namingstrategy.LongIdentifierNamingStrategy; +import org.hibernate.orm.test.annotations.namingstrategy.LongIdentifierNamingStrategy; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/charset/Iso88591CharsetNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/Iso88591CharsetNamingStrategyTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/charset/Iso88591CharsetNamingStrategyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/Iso88591CharsetNamingStrategyTest.java index 7ae6a2f401..f3e9053ee6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/charset/Iso88591CharsetNamingStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/Iso88591CharsetNamingStrategyTest.java @@ -6,7 +6,7 @@ */ // $Id$ -package org.hibernate.test.annotations.namingstrategy.charset; +package org.hibernate.orm.test.annotations.namingstrategy.charset; import org.hibernate.dialect.AbstractHANADialect; import org.hibernate.engine.jdbc.spi.JdbcServices; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/charset/Utf8CharsetNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/Utf8CharsetNamingStrategyTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/charset/Utf8CharsetNamingStrategyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/Utf8CharsetNamingStrategyTest.java index d35ca0cc75..f16a571d45 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/charset/Utf8CharsetNamingStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/Utf8CharsetNamingStrategyTest.java @@ -6,7 +6,7 @@ */ // $Id$ -package org.hibernate.test.annotations.namingstrategy.charset; +package org.hibernate.orm.test.annotations.namingstrategy.charset; import org.hibernate.dialect.AbstractHANADialect; import org.hibernate.engine.jdbc.spi.JdbcServices; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/BaseEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/BaseEntity.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/BaseEntity.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/BaseEntity.java index 24c2013d01..f1b7c6571c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/BaseEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/BaseEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.onetoone.hhh4851; +package org.hibernate.orm.test.annotations.onetoone.hhh4851; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Device.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Device.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Device.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Device.java index 31911f9aba..399e063981 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Device.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Device.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.onetoone.hhh4851; +package org.hibernate.orm.test.annotations.onetoone.hhh4851; import javax.persistence.Column; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java index f7df9796dd..b8d65ce2f7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.onetoone.hhh4851; +package org.hibernate.orm.test.annotations.onetoone.hhh4851; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/HHH4851Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/HHH4851Test.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/HHH4851Test.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/HHH4851Test.java index c224c186e1..85cd0dfa92 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/HHH4851Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/HHH4851Test.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.onetoone.hhh4851; +package org.hibernate.orm.test.annotations.onetoone.hhh4851; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Hardware.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Hardware.java index f32aa55fd5..f0bf2f7683 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Hardware.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.onetoone.hhh4851; +package org.hibernate.orm.test.annotations.onetoone.hhh4851; import javax.persistence.DiscriminatorColumn; import javax.persistence.DiscriminatorType; import javax.persistence.DiscriminatorValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/ManagedDevice.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/ManagedDevice.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/ManagedDevice.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/ManagedDevice.java index 86b7f224e5..fdde3c835b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/ManagedDevice.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/ManagedDevice.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.onetoone.hhh4851; +package org.hibernate.orm.test.annotations.onetoone.hhh4851; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.JoinColumn; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Owner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Owner.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Owner.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Owner.java index a7f6c91a49..9718447e06 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Owner.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/Owner.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.onetoone.hhh4851; +package org.hibernate.orm.test.annotations.onetoone.hhh4851; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/persister/Card.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/Card.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/persister/Card.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/Card.java index 30320adf45..f8bab90433 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/persister/Card.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/Card.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.persister; +package org.hibernate.orm.test.annotations.persister; import org.hibernate.annotations.Persister; import java.io.Serializable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/persister/CollectionPersister.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/CollectionPersister.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/persister/CollectionPersister.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/CollectionPersister.java index 38824b8d5b..b37ea8b71c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/persister/CollectionPersister.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/CollectionPersister.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.persister; +package org.hibernate.orm.test.annotations.persister; import org.hibernate.MappingException; import org.hibernate.cache.CacheException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/persister/Deck.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/Deck.java similarity index 73% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/persister/Deck.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/Deck.java index 0ba5545ede..22c932ef5a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/persister/Deck.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/Deck.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.persister; +package org.hibernate.orm.test.annotations.persister; import java.io.Serializable; import java.util.Set; import javax.persistence.Entity; @@ -18,12 +18,12 @@ import org.hibernate.annotations.Persister; * @author Shawn Clowater */ @Entity -@Persister( impl = org.hibernate.test.annotations.persister.EntityPersister.class ) +@Persister( impl = EntityPersister.class ) public class Deck implements Serializable { @Id public Integer id; @OneToMany( mappedBy = "deck" ) - @Persister( impl = org.hibernate.test.annotations.persister.CollectionPersister.class ) + @Persister( impl = CollectionPersister.class ) public Set cards; } diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/persister/EntityPersister.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/EntityPersister.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/persister/EntityPersister.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/EntityPersister.java index dc55bbf41a..af8d4e585c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/persister/EntityPersister.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/EntityPersister.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.persister; +package org.hibernate.orm.test.annotations.persister; import org.hibernate.HibernateException; import org.hibernate.cache.spi.access.EntityDataAccess; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/persister/PersisterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/PersisterTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/persister/PersisterTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/PersisterTest.java index 8e423fc7ac..6ca9d34a4e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/persister/PersisterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/persister/PersisterTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.persister; +package org.hibernate.orm.test.annotations.persister; import org.hibernate.mapping.Collection; import org.hibernate.mapping.PersistentClass; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java index c9ef323c90..468ef31c15 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.quote.resultsetmappings; +package org.hibernate.orm.test.annotations.quote.resultsetmappings; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/MyEntity.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/MyEntity.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/MyEntity.java index a0378fd0c3..008dd1726e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/MyEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/MyEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.quote.resultsetmappings; +package org.hibernate.orm.test.annotations.quote.resultsetmappings; import javax.persistence.Column; import javax.persistence.ColumnResult; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Administration.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Administration.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Administration.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Administration.java index 9d4cc07f80..9f354fd94e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Administration.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Administration.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.reflection; +package org.hibernate.orm.test.annotations.reflection; import javax.persistence.Basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Availability.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Availability.java similarity index 85% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Availability.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Availability.java index 7307111e6a..db1696876e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Availability.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Availability.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.reflection; +package org.hibernate.orm.test.annotations.reflection; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/BusTrip.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/BusTrip.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/BusTrip.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/BusTrip.java index 91f3b19465..497e74e09b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/BusTrip.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/BusTrip.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.reflection; +package org.hibernate.orm.test.annotations.reflection; import java.util.Date; import java.util.List; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/BusTripPk.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/BusTripPk.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/BusTripPk.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/BusTripPk.java index fa8dd69353..6f6bf541ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/BusTripPk.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/BusTripPk.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.reflection; +package org.hibernate.orm.test.annotations.reflection; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Company.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Company.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Company.java index 7a6c27f88a..e576c1edb4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Company.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Company.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.reflection; +package org.hibernate.orm.test.annotations.reflection; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Competition.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Competition.java similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Competition.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Competition.java index 3a0458a774..f536ce04ec 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Competition.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Competition.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.reflection; +package org.hibernate.orm.test.annotations.reflection; import javax.persistence.MappedSuperclass; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/ElementCollectionConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/ElementCollectionConverterTest.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/ElementCollectionConverterTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/ElementCollectionConverterTest.java index 161fdb4581..11b491f743 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/ElementCollectionConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/ElementCollectionConverterTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.reflection; +package org.hibernate.orm.test.annotations.reflection; import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder; @@ -32,7 +32,7 @@ public class ElementCollectionConverterTest extends BaseCoreFunctionalTestCase { @Override protected String[] getOrmXmlFiles() { - return new String[] { "org/hibernate/test/annotations/reflection/element-collection-converter-orm.xml" }; + return new String[] { "org/hibernate/orm/test/annotations/reflection/element-collection-converter-orm.xml" }; } diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java index 8eaec9352f..44c773fa7c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.reflection; +package org.hibernate.orm.test.annotations.reflection; import org.hibernate.annotations.Columns; import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappings; @@ -32,7 +32,7 @@ public class JPAXMLOverriddenAnnotationReaderTest extends BaseUnitTestCase { @Test public void testMappedSuperclassAnnotations() throws Exception { XMLContext context = buildContext( - "org/hibernate/test/annotations/reflection/metadata-complete.xml" + "org/hibernate/orm/test/annotations/reflection/metadata-complete.xml" ); JPAXMLOverriddenAnnotationReader reader = new JPAXMLOverriddenAnnotationReader( Organization.class, context, BootstrapContextImpl.INSTANCE ); assertTrue( reader.isAnnotationPresent( MappedSuperclass.class ) ); @@ -40,7 +40,7 @@ public class JPAXMLOverriddenAnnotationReaderTest extends BaseUnitTestCase { @Test public void testEntityRelatedAnnotations() throws Exception { - XMLContext context = buildContext( "org/hibernate/test/annotations/reflection/orm.xml" ); + XMLContext context = buildContext( "org/hibernate/orm/test/annotations/reflection/orm.xml" ); JPAXMLOverriddenAnnotationReader reader = new JPAXMLOverriddenAnnotationReader( Administration.class, context, BootstrapContextImpl.INSTANCE ); assertNotNull( reader.getAnnotation( Entity.class ) ); assertEquals( @@ -172,7 +172,7 @@ public class JPAXMLOverriddenAnnotationReaderTest extends BaseUnitTestCase { @Test public void testEntityRelatedAnnotationsMetadataComplete() throws Exception { XMLContext context = buildContext( - "org/hibernate/test/annotations/reflection/metadata-complete.xml" + "org/hibernate/orm/test/annotations/reflection/metadata-complete.xml" ); JPAXMLOverriddenAnnotationReader reader = new JPAXMLOverriddenAnnotationReader( Administration.class, context, BootstrapContextImpl.INSTANCE ); assertNotNull( reader.getAnnotation( Entity.class ) ); @@ -211,7 +211,7 @@ public class JPAXMLOverriddenAnnotationReaderTest extends BaseUnitTestCase { @Test public void testIdRelatedAnnotations() throws Exception { - XMLContext context = buildContext( "org/hibernate/test/annotations/reflection/orm.xml" ); + XMLContext context = buildContext( "org/hibernate/orm/test/annotations/reflection/orm.xml" ); Method method = Administration.class.getDeclaredMethod( "getId" ); JPAXMLOverriddenAnnotationReader reader = new JPAXMLOverriddenAnnotationReader( method, context, BootstrapContextImpl.INSTANCE ); assertNull( reader.getAnnotation( Id.class ) ); @@ -231,7 +231,7 @@ public class JPAXMLOverriddenAnnotationReaderTest extends BaseUnitTestCase { assertEquals( TemporalType.DATE, reader.getAnnotation( Temporal.class ).value() ); context = buildContext( - "org/hibernate/test/annotations/reflection/metadata-complete.xml" + "org/hibernate/orm/test/annotations/reflection/metadata-complete.xml" ); method = Administration.class.getDeclaredMethod( "getId" ); reader = new JPAXMLOverriddenAnnotationReader( method, context, BootstrapContextImpl.INSTANCE ); @@ -259,7 +259,7 @@ public class JPAXMLOverriddenAnnotationReaderTest extends BaseUnitTestCase { @Test public void testBasicRelatedAnnotations() throws Exception { XMLContext context = buildContext( - "org/hibernate/test/annotations/reflection/metadata-complete.xml" + "org/hibernate/orm/test/annotations/reflection/metadata-complete.xml" ); Field field = BusTrip.class.getDeclaredField( "status" ); JPAXMLOverriddenAnnotationReader reader = new JPAXMLOverriddenAnnotationReader( field, context, BootstrapContextImpl.INSTANCE ); @@ -283,7 +283,7 @@ public class JPAXMLOverriddenAnnotationReaderTest extends BaseUnitTestCase { @Test public void testVersionRelatedAnnotations() throws Exception { - XMLContext context = buildContext( "org/hibernate/test/annotations/reflection/orm.xml" ); + XMLContext context = buildContext( "org/hibernate/orm/test/annotations/reflection/orm.xml" ); Method method = Administration.class.getDeclaredMethod( "getVersion" ); JPAXMLOverriddenAnnotationReader reader = new JPAXMLOverriddenAnnotationReader( method, context, BootstrapContextImpl.INSTANCE ); assertNotNull( reader.getAnnotation( Version.class ) ); @@ -294,7 +294,7 @@ public class JPAXMLOverriddenAnnotationReaderTest extends BaseUnitTestCase { @Test public void testTransientAndEmbeddedRelatedAnnotations() throws Exception { - XMLContext context = buildContext( "org/hibernate/test/annotations/reflection/orm.xml" ); + XMLContext context = buildContext( "org/hibernate/orm/test/annotations/reflection/orm.xml" ); Field field = Administration.class.getDeclaredField( "transientField" ); JPAXMLOverriddenAnnotationReader reader = new JPAXMLOverriddenAnnotationReader( field, context, BootstrapContextImpl.INSTANCE ); @@ -308,7 +308,7 @@ public class JPAXMLOverriddenAnnotationReaderTest extends BaseUnitTestCase { @Test public void testAssociationRelatedAnnotations() throws Exception { - XMLContext context = buildContext( "org/hibernate/test/annotations/reflection/orm.xml" ); + XMLContext context = buildContext( "org/hibernate/orm/test/annotations/reflection/orm.xml" ); Field field = Administration.class.getDeclaredField( "defaultBusTrip" ); JPAXMLOverriddenAnnotationReader reader = new JPAXMLOverriddenAnnotationReader( field, context, BootstrapContextImpl.INSTANCE ); @@ -321,7 +321,7 @@ public class JPAXMLOverriddenAnnotationReaderTest extends BaseUnitTestCase { assertEquals( "test", reader.getAnnotation( OneToOne.class ).mappedBy() ); context = buildContext( - "org/hibernate/test/annotations/reflection/metadata-complete.xml" + "org/hibernate/orm/test/annotations/reflection/metadata-complete.xml" ); field = BusTrip.class.getDeclaredField( "players" ); reader = new JPAXMLOverriddenAnnotationReader( field, context, BootstrapContextImpl.INSTANCE ); @@ -347,7 +347,7 @@ public class JPAXMLOverriddenAnnotationReaderTest extends BaseUnitTestCase { @Test @TestForIssue(jiraKey = "HHH-11924") public void testElementCollectionConverter() throws Exception { - XMLContext context = buildContext( "org/hibernate/test/annotations/reflection/orm.xml" ); + XMLContext context = buildContext( "org/hibernate/orm/test/annotations/reflection/orm.xml" ); Field field = Company.class.getDeclaredField( "organizations" ); JPAXMLOverriddenAnnotationReader reader = new JPAXMLOverriddenAnnotationReader( field, context, BootstrapContextImpl.INSTANCE ); @@ -360,7 +360,7 @@ public class JPAXMLOverriddenAnnotationReaderTest extends BaseUnitTestCase { @Test public void testEntityListeners() throws Exception { - XMLContext context = buildContext( "org/hibernate/test/annotations/reflection/orm.xml" ); + XMLContext context = buildContext( "org/hibernate/orm/test/annotations/reflection/orm.xml" ); Method method = Administration.class.getDeclaredMethod( "calculate" ); JPAXMLOverriddenAnnotationReader reader = new JPAXMLOverriddenAnnotationReader( method, context, BootstrapContextImpl.INSTANCE ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/LogListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/LogListener.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/LogListener.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/LogListener.java index 85c0fab2f6..c2adcdc7a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/LogListener.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/LogListener.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.reflection; +package org.hibernate.orm.test.annotations.reflection; import javax.persistence.PostPersist; import javax.persistence.PrePersist; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Match.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Match.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Match.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Match.java index 771ddcf83d..4f009ab8f2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Match.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Match.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.reflection; +package org.hibernate.orm.test.annotations.reflection; import javax.persistence.Entity; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Organization.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Organization.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Organization.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Organization.java index 31029da563..3d9f903ef0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Organization.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Organization.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.reflection; +package org.hibernate.orm.test.annotations.reflection; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/OrganizationConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OrganizationConverter.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/OrganizationConverter.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OrganizationConverter.java index 3a68b3e914..96c1ffb760 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/OrganizationConverter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OrganizationConverter.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.reflection; +package org.hibernate.orm.test.annotations.reflection; import javax.persistence.AttributeConverter; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/OtherLogListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OtherLogListener.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/OtherLogListener.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OtherLogListener.java index 37bed170d5..b2af74129e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/OtherLogListener.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/OtherLogListener.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.reflection; +package org.hibernate.orm.test.annotations.reflection; import javax.persistence.PostPersist; import javax.persistence.PrePersist; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityMoralAccount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityMoralAccount.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityMoralAccount.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityMoralAccount.java index 67346d472f..f734389ead 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityMoralAccount.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityMoralAccount.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.reflection; +package org.hibernate.orm.test.annotations.reflection; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; import javax.persistence.IdClass; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityNumber.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityNumber.java index 6ecd345ea0..41497c8f8c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityNumber.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.reflection; +package org.hibernate.orm.test.annotations.reflection; import java.io.Serializable; import javax.persistence.Embeddable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityPhysicalAccount.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityPhysicalAccount.java similarity index 88% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityPhysicalAccount.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityPhysicalAccount.java index 27ea376a05..e250d13243 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityPhysicalAccount.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityPhysicalAccount.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.reflection; +package org.hibernate.orm.test.annotations.reflection; import javax.persistence.Entity; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/TennisMatch.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/TennisMatch.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/TennisMatch.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/TennisMatch.java index 76b5d21412..ce5c433999 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/TennisMatch.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/TennisMatch.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.reflection; +package org.hibernate.orm.test.annotations.reflection; import javax.persistence.AttributeOverride; import javax.persistence.AttributeOverrides; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/XMLContextTest.java similarity index 82% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/XMLContextTest.java index 22f6e4dbb6..9c4cb5ec7e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/XMLContextTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.reflection; +package org.hibernate.orm.test.annotations.reflection; import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappings; import org.hibernate.cfg.annotations.reflection.internal.XMLContext; @@ -24,7 +24,8 @@ public class XMLContextTest { XMLMappingHelper xmlHelper = new XMLMappingHelper(); final XMLContext context = new XMLContext( BootstrapContextImpl.INSTANCE ); - JaxbEntityMappings mappings = xmlHelper.readOrmXmlMappings( "org/hibernate/test/annotations/reflection/orm.xml" ); + JaxbEntityMappings mappings = xmlHelper.readOrmXmlMappings( + "org/hibernate/orm/test/annotations/reflection/orm.xml" ); context.addDocument( mappings ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/secondarytable/SecondaryTableSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableSchemaTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/secondarytable/SecondaryTableSchemaTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableSchemaTest.java index 79f37e3415..cf02bc8910 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/secondarytable/SecondaryTableSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableSchemaTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.secondarytable; +package org.hibernate.orm.test.annotations.secondarytable; import java.io.Serializable; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/selectbeforeupdate/UpdateDetachedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/selectbeforeupdate/UpdateDetachedTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/selectbeforeupdate/UpdateDetachedTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/selectbeforeupdate/UpdateDetachedTest.java index 63d8411a6e..2559049462 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/selectbeforeupdate/UpdateDetachedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/selectbeforeupdate/UpdateDetachedTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.selectbeforeupdate; +package org.hibernate.orm.test.annotations.selectbeforeupdate; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/strategy/Location.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/Location.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/strategy/Location.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/Location.java index a912e5e271..344af423c9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/strategy/Location.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/Location.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.strategy; +package org.hibernate.orm.test.annotations.strategy; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/strategy/Storm.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/Storm.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/strategy/Storm.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/Storm.java index ac7f668618..2252d09ddb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/strategy/Storm.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/Storm.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.test.annotations.strategy; +package org.hibernate.orm.test.annotations.strategy; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/strategy/StrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/StrategyTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/strategy/StrategyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/StrategyTest.java index baa2b085df..f7cd39b31d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/strategy/StrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/strategy/StrategyTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.strategy; +package org.hibernate.orm.test.annotations.strategy; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/subselect/Bid.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Bid.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/subselect/Bid.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Bid.java index cc86cea783..270b5ffc4f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/subselect/Bid.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Bid.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.subselect; +package org.hibernate.orm.test.annotations.subselect; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/subselect/HighestBid.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/HighestBid.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/subselect/HighestBid.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/HighestBid.java index 184c024f58..10c9d3389a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/subselect/HighestBid.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/HighestBid.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.subselect; +package org.hibernate.orm.test.annotations.subselect; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/subselect/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Item.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/subselect/Item.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Item.java index ba6e6894a6..967bd45280 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/subselect/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/Item.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.subselect; +package org.hibernate.orm.test.annotations.subselect; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/subselect/SubselectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/SubselectTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/subselect/SubselectTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/SubselectTest.java index ffe8d091ba..e55744ae84 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/subselect/SubselectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/SubselectTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.subselect; +package org.hibernate.orm.test.annotations.subselect; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/target/Brand.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Brand.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/target/Brand.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Brand.java index 51887c763e..83633c42d4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/target/Brand.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Brand.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.target; +package org.hibernate.orm.test.annotations.target; import java.util.HashMap; import java.util.Map; import javax.persistence.ElementCollection; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/target/Luggage.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Luggage.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/target/Luggage.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Luggage.java index 4259064762..34d7505036 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/target/Luggage.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Luggage.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.target; +package org.hibernate.orm.test.annotations.target; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/LuggageImpl.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/LuggageImpl.java index 0dcbfee3ec..965e09943c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/LuggageImpl.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.target; +package org.hibernate.orm.test.annotations.target; import javax.persistence.Embedded; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/target/Owner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Owner.java similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/target/Owner.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Owner.java index 8412d93aa5..6b397f47b2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/target/Owner.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Owner.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.target; +package org.hibernate.orm.test.annotations.target; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/target/OwnerImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/OwnerImpl.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/target/OwnerImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/OwnerImpl.java index b8395d1896..16e8ad75fe 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/target/OwnerImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/OwnerImpl.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.target; +package org.hibernate.orm.test.annotations.target; import javax.persistence.Embeddable; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/target/Size.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Size.java similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/target/Size.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Size.java index 73329c2f65..47d7e86ace 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/target/Size.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/Size.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.target; +package org.hibernate.orm.test.annotations.target; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/target/SizeImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/SizeImpl.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/target/SizeImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/SizeImpl.java index d91f2409d9..d0dee07d63 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/target/SizeImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/SizeImpl.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.target; +package org.hibernate.orm.test.annotations.target; import javax.persistence.Column; import javax.persistence.Embeddable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/target/TargetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/TargetTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/target/TargetTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/TargetTest.java index c091e2f350..d8124f196b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/target/TargetTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/target/TargetTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.target; +package org.hibernate.orm.test.annotations.target; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintTest.java similarity index 88% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintTest.java index d640e4ee39..6edbc7298e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.uniqueconstraint; +package org.hibernate.orm.test.annotations.uniqueconstraint; import javax.persistence.PersistenceException; @@ -12,6 +12,9 @@ import org.hibernate.JDBCException; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.hibernate.test.annotations.uniqueconstraint.Building; +import org.hibernate.test.annotations.uniqueconstraint.House; +import org.hibernate.test.annotations.uniqueconstraint.Room; import org.junit.Test; import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java index 7393215cdc..162df468f5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.uniqueconstraint; +package org.hibernate.orm.test.annotations.uniqueconstraint; import javax.persistence.Basic; import javax.persistence.Column; @@ -66,7 +66,7 @@ public class UniqueConstraintThrowsConstraintViolationExceptionTest extends Base return true; } - @Entity + @Entity(name = "Customer") @Table(name = "CUSTOMER") public static class Customer { diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java index 86f4aa3ef9..35078e43c0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.uniqueconstraint; +package org.hibernate.orm.test.annotations.uniqueconstraint; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java index d311789a70..06c0a3f988 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.uniqueconstraint; +package org.hibernate.orm.test.annotations.uniqueconstraint; import java.io.Serializable; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/various/IndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/IndexTest.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/various/IndexTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/IndexTest.java index a46d832f64..84632f3179 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/various/IndexTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/IndexTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.various; +package org.hibernate.orm.test.annotations.various; import java.util.Date; @@ -12,6 +12,10 @@ import org.junit.Test; import org.hibernate.Session; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.hibernate.test.annotations.various.Conductor; +import org.hibernate.test.annotations.various.ProfessionalAgreement; +import org.hibernate.test.annotations.various.Truck; +import org.hibernate.test.annotations.various.Vehicule; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/various/OptimisticLockAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OptimisticLockAnnotationTest.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/various/OptimisticLockAnnotationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OptimisticLockAnnotationTest.java index b5d1b4a6f4..2411e19a31 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/various/OptimisticLockAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OptimisticLockAnnotationTest.java @@ -4,13 +4,15 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.various; +package org.hibernate.orm.test.annotations.various; import org.junit.Test; import org.hibernate.Session; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.hibernate.test.annotations.various.Conductor; + import static org.junit.Assert.assertEquals; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/CarModel.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/CarModel.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/CarModel.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/CarModel.java index 2c6fbe7770..52eef3149e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/CarModel.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/CarModel.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.xml.ejb3; +package org.hibernate.orm.test.annotations.xml.ejb3; import javax.persistence.Column; import java.util.Date; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Company.java similarity index 88% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Company.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Company.java index ccc71757ab..6a25dc404a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Company.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Company.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.xml.ejb3; +package org.hibernate.orm.test.annotations.xml.ejb3; import java.util.HashMap; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java index 73d749f4f0..8669b5e11f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.xml.ejb3; +package org.hibernate.orm.test.annotations.xml.ejb3; import javax.persistence.Access; import javax.persistence.AccessType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java index 7f37ff4363..ce4b536dd0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.xml.ejb3; +package org.hibernate.orm.test.annotations.xml.ejb3; import javax.persistence.Access; import javax.persistence.AccessType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java index dfe16a7468..53ab22f83f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.xml.ejb3; +package org.hibernate.orm.test.annotations.xml.ejb3; import javax.persistence.Access; import javax.persistence.AccessType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java index c1eda4f9d2..0041eff822 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.xml.ejb3; +package org.hibernate.orm.test.annotations.xml.ejb3; import javax.persistence.Access; import javax.persistence.AccessType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java index e513889c0f..ead49da9cb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.xml.ejb3; +package org.hibernate.orm.test.annotations.xml.ejb3; import javax.persistence.Access; import javax.persistence.AccessType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTest.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTest.java index 612a2e7b7c..4b66b21a5f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.xml.ejb3; +package org.hibernate.orm.test.annotations.xml.ejb3; import java.util.Date; import java.util.List; @@ -39,7 +39,7 @@ public class Ejb3XmlTest extends BaseCoreFunctionalTestCase { } @Test - @SkipForDialect(value = {PostgreSQL81Dialect.class, PostgreSQLDialect.class, CockroachDialect.class}, + @SkipForDialect(value = {PostgreSQLDialect.class, CockroachDialect.class}, comment = "postgresql jdbc driver does not implement the setQueryTimeout method") @SkipForDialect(value = TeradataDialect.class, jiraKey = "HHH-8190", @@ -142,10 +142,10 @@ public class Ejb3XmlTest extends BaseCoreFunctionalTestCase { @Override protected String[] getOrmXmlFiles() { return new String[] { - "org/hibernate/test/annotations/xml/ejb3/orm.xml", - "org/hibernate/test/annotations/xml/ejb3/orm2.xml", - "org/hibernate/test/annotations/xml/ejb3/orm3.xml", - "org/hibernate/test/annotations/xml/ejb3/orm4.xml" + "org/hibernate/orm/test/annotations/xml/ejb3/orm.xml", + "org/hibernate/orm/test/annotations/xml/ejb3/orm2.xml", + "org/hibernate/orm/test/annotations/xml/ejb3/orm3.xml", + "org/hibernate/orm/test/annotations/xml/ejb3/orm4.xml" }; } } diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java index b5b18a7815..013db4f65e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.xml.ejb3; +package org.hibernate.orm.test.annotations.xml.ejb3; import java.io.InputStream; import java.lang.annotation.Annotation; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity1.java similarity index 88% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity1.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity1.java index a3a381e708..8c5e1a0935 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity1.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.xml.ejb3; +package org.hibernate.orm.test.annotations.xml.ejb3; public class Entity1 { diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity2.java similarity index 88% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity2.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity2.java index 7c0267285e..99acc90c12 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity2.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.xml.ejb3; +package org.hibernate.orm.test.annotations.xml.ejb3; import java.util.List; public class Entity2 { diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity3.java similarity index 88% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity3.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity3.java index 3740f2eee9..560822e18a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity3.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity3.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.xml.ejb3; +package org.hibernate.orm.test.annotations.xml.ejb3; import java.util.Map; public class Entity3 { diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Light.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Light.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Light.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Light.java index 433f102ef2..a6e9b1537a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Light.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Light.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.xml.ejb3; +package org.hibernate.orm.test.annotations.xml.ejb3; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Lighter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Lighter.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Lighter.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Lighter.java index a23fb93b7d..25ea9e7aaf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Lighter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Lighter.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.xml.ejb3; +package org.hibernate.orm.test.annotations.xml.ejb3; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Manufacturer.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Manufacturer.java index 2aaee9f909..8cd34a3245 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Manufacturer.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.xml.ejb3; +package org.hibernate.orm.test.annotations.xml.ejb3; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Model.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Model.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Model.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Model.java index c0c17ce9d3..c8c1f565d4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Model.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Model.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.xml.ejb3; +package org.hibernate.orm.test.annotations.xml.ejb3; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java index adc2b3d6fb..c0a8f191fa 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.xml.ejb3; +package org.hibernate.orm.test.annotations.xml.ejb3; import org.hibernate.InvalidMappingException; import org.hibernate.boot.MetadataSources; @@ -24,7 +24,7 @@ public class NonExistentOrmVersionTest extends BaseUnitTestCase { try { BootstrapServiceRegistryBuilder builder = new BootstrapServiceRegistryBuilder(); new MetadataSources( builder.build() ) - .addResource( "org/hibernate/test/annotations/xml/ejb3/orm5.xml" ) + .addResource( "org/hibernate/orm/test/annotations/xml/ejb3/orm5.xml" ) .buildMetadata(); fail( "Expecting failure due to unsupported xsd version" ); } diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java index 24b932b9d2..8fb2da1dba 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.xml.ejb3; +package org.hibernate.orm.test.annotations.xml.ejb3; import org.hibernate.Session; import org.hibernate.Transaction; @@ -61,6 +61,6 @@ public class OrmVersion1SupportedTest extends BaseCoreFunctionalTestCase { @Override protected String[] getOrmXmlFiles() { - return new String[] { "org/hibernate/test/annotations/xml/ejb3/orm2.xml" }; + return new String[] { "org/hibernate/orm/test/annotations/xml/ejb3/orm2.xml" }; } } diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/PreParsedOrmXmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/PreParsedOrmXmlTest.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/PreParsedOrmXmlTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/PreParsedOrmXmlTest.java index a2c8faf9e0..97030939b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/PreParsedOrmXmlTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/PreParsedOrmXmlTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.xml.ejb3; +package org.hibernate.orm.test.annotations.xml.ejb3; import java.io.IOException; import java.io.InputStream; @@ -32,7 +32,7 @@ public class PreParsedOrmXmlTest extends BaseCoreFunctionalTestCase { protected void addMappings(Configuration configuration) { super.addMappings( configuration ); try (InputStream xmlStream = Thread.currentThread().getContextClassLoader() - .getResourceAsStream( "org/hibernate/test/annotations/xml/ejb3/pre-parsed-orm.xml" )) { + .getResourceAsStream( "org/hibernate/orm/test/annotations/xml/ejb3/pre-parsed-orm.xml" )) { Binding parsed = configuration.getXmlMappingBinderAccess().bind( xmlStream ); configuration.addXmlMapping( parsed ); } diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/VicePresident.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/VicePresident.java similarity index 84% rename from hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/VicePresident.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/VicePresident.java index bd36c0b0ef..527a236195 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/VicePresident.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/VicePresident.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.annotations.xml.ejb3; +package org.hibernate.orm.test.annotations.xml.ejb3; public class VicePresident { int id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/batch/BatchOptimisticLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchOptimisticLockingTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/batch/BatchOptimisticLockingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchOptimisticLockingTest.java index c552af3092..fe86b12e00 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/batch/BatchOptimisticLockingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchOptimisticLockingTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.batch; +package org.hibernate.orm.test.batch; import java.util.List; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/test/batch/BatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java old mode 100755 new mode 100644 similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/batch/BatchTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java index 81b21ec284..6b4836f6d2 --- a/hibernate-core/src/test/java/org/hibernate/test/batch/BatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.batch; +package org.hibernate.orm.test.batch; import java.math.BigDecimal; @@ -26,6 +26,12 @@ import org.junit.Test; * @author Gavin King */ public class BatchTest extends BaseCoreFunctionalTestCase { + + @Override + protected String getBaseForMappings() { + return "org/hibernate/orm/test/"; + } + @Override public String[] getMappings() { return new String[] { "batch/DataPoint.hbm.xml" }; diff --git a/hibernate-core/src/test/java/org/hibernate/test/batch/BatchingBatchFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/batch/BatchingBatchFailureTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java index 59cae996c9..6b4fa5cfd5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/batch/BatchingBatchFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.batch; +package org.hibernate.orm.test.batch; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/batch/BatchingInheritanceDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceDeleteTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/batch/BatchingInheritanceDeleteTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceDeleteTest.java index 48904cc1e0..076a1d98e3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/batch/BatchingInheritanceDeleteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingInheritanceDeleteTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.batch; +package org.hibernate.orm.test.batch; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/batch/DataPoint.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/DataPoint.hbm.xml old mode 100755 new mode 100644 similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/batch/DataPoint.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/batch/DataPoint.hbm.xml index 5b32efe1eb..d23bb13073 --- a/hibernate-core/src/test/java/org/hibernate/test/batch/DataPoint.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/DataPoint.hbm.xml @@ -10,7 +10,7 @@ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + package="org.hibernate.orm.test.batch"> diff --git a/hibernate-core/src/test/java/org/hibernate/test/batch/DataPoint.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/DataPoint.java old mode 100755 new mode 100644 similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/batch/DataPoint.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/batch/DataPoint.java index f19389be0f..42081f4e46 --- a/hibernate-core/src/test/java/org/hibernate/test/batch/DataPoint.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/DataPoint.java @@ -6,7 +6,7 @@ */ //$Id: DataPoint.java 4343 2004-08-16 11:46:19Z oneovthafew $ -package org.hibernate.test.batch; +package org.hibernate.orm.test.batch; import java.math.BigDecimal; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/batch/NonBatchingBatchFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/NonBatchingBatchFailureTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/batch/NonBatchingBatchFailureTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/batch/NonBatchingBatchFailureTest.java index 6561d37645..cb3819bb48 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/batch/NonBatchingBatchFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/NonBatchingBatchFailureTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.batch; +package org.hibernate.orm.test.batch; import java.lang.reflect.Field; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/test/batch/OptionalSecondaryTableBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/OptionalSecondaryTableBatchTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/batch/OptionalSecondaryTableBatchTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/batch/OptionalSecondaryTableBatchTest.java index 9f35eb6c15..0ef79bd844 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/batch/OptionalSecondaryTableBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/OptionalSecondaryTableBatchTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.batch; +package org.hibernate.orm.test.batch; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/boot/cfgXml/CfgXmlParsingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlParsingTest.java similarity index 88% rename from hibernate-core/src/test/java/org/hibernate/test/boot/cfgXml/CfgXmlParsingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlParsingTest.java index f6be8b5129..b9bec24161 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/boot/cfgXml/CfgXmlParsingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlParsingTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.boot.cfgXml; +package org.hibernate.orm.test.boot.cfgXml; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; @@ -24,7 +24,7 @@ public class CfgXmlParsingTest extends BaseUnitTestCase { @Test public void testCfgXmlWithSchemaLocation() { StandardServiceRegistry ssr = new StandardServiceRegistryBuilder() - .configure( "org/hibernate/test/boot/cfgXml/hibernate.cfg.xml" ) + .configure( "org/hibernate/orm/test/boot/cfgXml/hibernate.cfg.xml" ) .build(); try { final ConfigurationService cs = ssr.getService( ConfigurationService.class ); @@ -41,7 +41,7 @@ public class CfgXmlParsingTest extends BaseUnitTestCase { @Test(expected = ConfigurationException.class ) public void testCfgXmlWithBadNamespaceAndSchemaLocation() { StandardServiceRegistry ssr = new StandardServiceRegistryBuilder() - .configure( "org/hibernate/test/boot/cfgXml/badnamespace.cfg.xml" ) + .configure( "org/hibernate/orm/test/boot/cfgXml/badnamespace.cfg.xml" ) .build(); StandardServiceRegistryBuilder.destroy( ssr ); fail( "Expecting the bad namespace to fail" ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java index 0ec3c4bcfd..bd26e3bc64 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlResourceNameClosingTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.boot.cfgXml; +package org.hibernate.orm.test.boot.cfgXml; import java.io.IOException; import java.io.InputStream; @@ -17,7 +17,6 @@ import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl; -import org.hibernate.engine.config.spi.ConfigurationService; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseUnitTestCase; @@ -96,7 +95,7 @@ public class CfgXmlResourceNameClosingTest extends BaseUnitTestCase { .applyClassLoaderService( classLoaderService ) .build(); StandardServiceRegistry ssr = new StandardServiceRegistryBuilder( bsr ) - .configure( "org/hibernate/test/boot/cfgXml/hibernate.cfg.xml" ) + .configure( "org/hibernate/orm/test/boot/cfgXml/hibernate.cfg.xml" ) .build(); try { for ( InputStreamWrapper openedStream : classLoaderService.openedStreams ) { diff --git a/hibernate-core/src/test/java/org/hibernate/test/boot/cfgXml/badnamespace.cfg.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/badnamespace.cfg.xml similarity index 100% rename from hibernate-core/src/test/java/org/hibernate/test/boot/cfgXml/badnamespace.cfg.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/badnamespace.cfg.xml diff --git a/hibernate-core/src/test/java/org/hibernate/test/boot/cfgXml/hibernate.cfg.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/hibernate.cfg.xml similarity index 100% rename from hibernate-core/src/test/java/org/hibernate/test/boot/cfgXml/hibernate.cfg.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/hibernate.cfg.xml diff --git a/hibernate-core/src/test/java/org/hibernate/test/boot/database/qualfiedTableNaming/NamespaceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/NamespaceTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/boot/database/qualfiedTableNaming/NamespaceTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/NamespaceTest.java index 7ecfd501bb..a8c6c19e68 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/boot/database/qualfiedTableNaming/NamespaceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/NamespaceTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.boot.database.qualfiedTableNaming; +package org.hibernate.orm.test.boot.database.qualfiedTableNaming; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.boot.model.naming.PhysicalNamingStrategy; diff --git a/hibernate-core/src/test/java/org/hibernate/test/boot/database/qualfiedTableNaming/QualifiedTableNamingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/QualifiedTableNamingTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/boot/database/qualfiedTableNaming/QualifiedTableNamingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/QualifiedTableNamingTest.java index 8e477186a3..6fa395bde2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/boot/database/qualfiedTableNaming/QualifiedTableNamingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/database/qualfiedTableNaming/QualifiedTableNamingTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.boot.database.qualfiedTableNaming; +package org.hibernate.orm.test.boot.database.qualfiedTableNaming; import java.sql.Connection; import java.sql.SQLException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/boot/jaxb/hbm/internal/EntityModeConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/EntityModeConverterTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/boot/jaxb/hbm/internal/EntityModeConverterTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/EntityModeConverterTest.java index 7bf232d7c5..4a648231c9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/boot/jaxb/hbm/internal/EntityModeConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/EntityModeConverterTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.boot.jaxb.hbm.internal; +package org.hibernate.orm.test.boot.jaxb.hbm.internal; import org.hibernate.EntityMode; import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmHibernateMapping; diff --git a/hibernate-core/src/test/java/org/hibernate/test/boot/jaxb/hbm/internal/GenerationTimingConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/GenerationTimingConverterTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/boot/jaxb/hbm/internal/GenerationTimingConverterTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/GenerationTimingConverterTest.java index 98d29cbc30..108aaf6c13 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/boot/jaxb/hbm/internal/GenerationTimingConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/GenerationTimingConverterTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.boot.jaxb.hbm.internal; +package org.hibernate.orm.test.boot.jaxb.hbm.internal; import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmBasicAttributeType; import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmHibernateMapping; diff --git a/hibernate-core/src/test/java/org/hibernate/test/boot/jaxb/hbm/internal/XmlBindingChecker.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/XmlBindingChecker.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/boot/jaxb/hbm/internal/XmlBindingChecker.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/XmlBindingChecker.java index 21d9c30aac..1f860eb864 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/boot/jaxb/hbm/internal/XmlBindingChecker.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/jaxb/hbm/internal/XmlBindingChecker.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.boot.jaxb.hbm.internal; +package org.hibernate.orm.test.boot.jaxb.hbm.internal; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/hibernate-core/src/test/java/org/hibernate/test/boot/model/relational/QualifiedNameParserTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/relational/QualifiedNameParserTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/boot/model/relational/QualifiedNameParserTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/relational/QualifiedNameParserTest.java index 0863e29b6c..d3e1c5b370 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/boot/model/relational/QualifiedNameParserTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/relational/QualifiedNameParserTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.boot.model.relational; +package org.hibernate.orm.test.boot.model.relational; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.boot.model.relational.QualifiedNameParser; diff --git a/hibernate-core/src/test/java/org/hibernate/test/boot/model/source/AttributePathTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/source/AttributePathTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/boot/model/source/AttributePathTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/source/AttributePathTest.java index 0be1d9904c..ec1f61cd9f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/boot/model/source/AttributePathTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/model/source/AttributePathTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.boot.model.source; +package org.hibernate.orm.test.boot.model.source; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/EmbeddedOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/EmbeddedOverrideTests.java index 67ba347034..e5945ebb04 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/EmbeddedOverrideTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/EmbeddedOverrideTests.java @@ -17,17 +17,15 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; -import org.hibernate.mapping.BasicValue; import org.hibernate.mapping.Component; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; -import org.hibernate.mapping.Selectable; import org.hibernate.mapping.ToOne; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.DomainModelScope; import org.hibernate.testing.orm.junit.SessionFactory; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/MappedSuperclassOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/MappedSuperclassOverrideTests.java index 499db41f35..1f61029d7a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/MappedSuperclassOverrideTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/associationOverride/MappedSuperclassOverrideTests.java @@ -21,7 +21,7 @@ import org.hibernate.testing.orm.junit.DomainModelScope; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/EmbeddedOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/EmbeddedOverrideTests.java index d995566d4f..01581d04e8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/EmbeddedOverrideTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/EmbeddedOverrideTests.java @@ -28,7 +28,7 @@ import org.hibernate.testing.orm.junit.DomainModelScope; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/MappedSuperclassOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/MappedSuperclassOverrideTests.java index f13dc61d67..a7e7ecc4dc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/MappedSuperclassOverrideTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/MappedSuperclassOverrideTests.java @@ -22,7 +22,7 @@ import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/PluralEmbeddedOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/PluralEmbeddedOverrideTests.java index 93c0a4bec2..2ea8a48423 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/PluralEmbeddedOverrideTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/PluralEmbeddedOverrideTests.java @@ -33,7 +33,7 @@ import org.hibernate.testing.orm.junit.FailureExpected; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/TablePerClassOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/TablePerClassOverrideTests.java index 38f9ee7267..034047a7b0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/TablePerClassOverrideTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/TablePerClassOverrideTests.java @@ -25,7 +25,7 @@ import org.hibernate.testing.orm.junit.FailureExpected; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java index 8bd7cc856d..0b46771bdb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java @@ -29,7 +29,7 @@ import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.hibernate.testing.orm.junit.Setting; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideSchemaTest.java index 0a45f56c29..6a36137994 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideSchemaTest.java @@ -12,7 +12,7 @@ import org.hibernate.mapping.Table; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideTest.java index 9583f73f26..80339a689a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AssociationOverrideTest.java @@ -20,7 +20,7 @@ import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.hibernate.testing.orm.junit.Setting; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.jupiter.api.Test; import static org.junit.Assert.assertTrue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AttributeOverrideTest.java index 4138c441dc..06f023e27f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AttributeOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/override/AttributeOverrideTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.bootstrap.binding.annotations.override; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/schema/SchemaManagementScriptTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/schema/SchemaManagementScriptTests.java index 75be67e01b..fdb9b36cb2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/schema/SchemaManagementScriptTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/schema/SchemaManagementScriptTests.java @@ -31,9 +31,9 @@ import static org.hamcrest.MatcherAssert.assertThat; public class SchemaManagementScriptTests { private final Dialect dialect = new H2Dialect(); - private final String FIRST = "first statement"; - private final String SECOND = "second statement"; - private final String THIRD = "third statement"; + private final String FIRST = "first statement"; + private final String SECOND = "second statement"; + private final String THIRD = "third statement"; @Test public void testSimpleExtraction() { diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/Bean.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/Bean.hbm.xml similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/Bean.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/Bean.hbm.xml index fc229423e7..fa4fafc342 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/Bean.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/Bean.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/Bean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/Bean.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/Bean.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/Bean.java index d52f4070cb..4517797ea5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/Bean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/Bean.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode; +package org.hibernate.orm.test.bytecode; import java.text.ParseException; import java.util.Date; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/BeanReflectionHelper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/BeanReflectionHelper.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/BeanReflectionHelper.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/BeanReflectionHelper.java index cb21890aa1..887d5b6d08 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/BeanReflectionHelper.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/BeanReflectionHelper.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode; +package org.hibernate.orm.test.bytecode; import java.util.Date; import org.hibernate.property.access.internal.PropertyAccessStrategyBasicImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/InvocationTargetExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/InvocationTargetExceptionTest.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/InvocationTargetExceptionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/InvocationTargetExceptionTest.java index 5c47b3521a..826459e783 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/InvocationTargetExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/InvocationTargetExceptionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode; +package org.hibernate.orm.test.bytecode; import java.text.ParseException; @@ -18,6 +18,12 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; public class InvocationTargetExceptionTest extends BaseCoreFunctionalTestCase { + + @Override + protected String getBaseForMappings() { + return "org/hibernate/orm/test/"; + } + @Override public String[] getMappings() { return new String[] { "bytecode/Bean.hbm.xml" }; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/ProxyBean.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ProxyBean.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/ProxyBean.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ProxyBean.java index e397331579..e3c46dc3f5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/ProxyBean.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ProxyBean.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode; +package org.hibernate.orm.test.bytecode; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/ReflectionOptimizerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ReflectionOptimizerTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/ReflectionOptimizerTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ReflectionOptimizerTest.java index 708287de90..5b7d8bc14e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/ReflectionOptimizerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ReflectionOptimizerTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode; +package org.hibernate.orm.test.bytecode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/access/MixedAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/access/MixedAccessTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/access/MixedAccessTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/access/MixedAccessTest.java index 0264035f1b..63db4f64d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/access/MixedAccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/access/MixedAccessTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.bytecode.enhancement.access; +package org.hibernate.orm.test.bytecode.enhancement.access; import org.hibernate.bytecode.enhance.spi.UnloadedClass; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/association/InheritedAttributeAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/InheritedAttributeAssociationTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/association/InheritedAttributeAssociationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/InheritedAttributeAssociationTest.java index 69fcadfbeb..13b5efc06c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/association/InheritedAttributeAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/InheritedAttributeAssociationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.association; +package org.hibernate.orm.test.bytecode.enhancement.association; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/association/ManyToManyAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/association/ManyToManyAssociationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationTest.java index b4843d27ec..d75ce14998 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/association/ManyToManyAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.association; +package org.hibernate.orm.test.bytecode.enhancement.association; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; import org.junit.Assert; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/association/OneToManyAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyAssociationTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/association/OneToManyAssociationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyAssociationTest.java index c6e7c772b9..960bfa6e8b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/association/OneToManyAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyAssociationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.association; +package org.hibernate.orm.test.bytecode.enhancement.association; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; import org.junit.Assert; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/association/OneToOneAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToOneAssociationTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/association/OneToOneAssociationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToOneAssociationTest.java index d40f8591ca..3773007596 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/association/OneToOneAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToOneAssociationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.association; +package org.hibernate.orm.test.bytecode.enhancement.association; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; import org.hibernate.testing.bytecode.enhancement.EnhancerTestUtils; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/BasicEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicEnhancementTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/BasicEnhancementTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicEnhancementTest.java index fa07ca062c..44b39fb56f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/BasicEnhancementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicEnhancementTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.basic; +package org.hibernate.orm.test.bytecode.enhancement.basic; import org.hibernate.engine.spi.ManagedEntity; import org.hibernate.engine.spi.PersistentAttributeInterceptable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/BasicSessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicSessionTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/BasicSessionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicSessionTest.java index b32c7a9449..e479763061 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/BasicSessionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicSessionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.basic; +package org.hibernate.orm.test.bytecode.enhancement.basic; import org.hibernate.engine.spi.EntityEntry; import org.hibernate.engine.spi.ManagedEntity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/CrossEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/CrossEnhancementTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/CrossEnhancementTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/CrossEnhancementTest.java index d3f270918c..8ed74fa2d9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/CrossEnhancementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/CrossEnhancementTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.basic; +package org.hibernate.orm.test.bytecode.enhancement.basic; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/ExtendedAssociationManagementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ExtendedAssociationManagementTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/ExtendedAssociationManagementTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ExtendedAssociationManagementTest.java index 180c623a77..3fa53e3b44 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/ExtendedAssociationManagementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ExtendedAssociationManagementTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.basic; +package org.hibernate.orm.test.bytecode.enhancement.basic; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; import org.hibernate.testing.bytecode.enhancement.EnhancerTestUtils; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/GenericReturnValueMappedSuperclassEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/GenericReturnValueMappedSuperclassEnhancementTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/GenericReturnValueMappedSuperclassEnhancementTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/GenericReturnValueMappedSuperclassEnhancementTest.java index a4c6a59f26..5db0df2998 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/GenericReturnValueMappedSuperclassEnhancementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/GenericReturnValueMappedSuperclassEnhancementTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.basic; +package org.hibernate.orm.test.bytecode.enhancement.basic; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/InheritedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/InheritedTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/InheritedTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/InheritedTest.java index c38cc51679..ae6fb32931 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/InheritedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/InheritedTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.bytecode.enhancement.basic; +package org.hibernate.orm.test.bytecode.enhancement.basic; import org.hibernate.bytecode.enhance.spi.DefaultEnhancementContext; import org.hibernate.bytecode.enhance.spi.UnloadedClass; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/MappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/MappedSuperclassTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/MappedSuperclassTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/MappedSuperclassTest.java index 1f11aece96..bbf455156c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/MappedSuperclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/MappedSuperclassTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.bytecode.enhancement.basic; +package org.hibernate.orm.test.bytecode.enhancement.basic; import org.hibernate.bytecode.enhance.spi.DefaultEnhancementContext; import org.hibernate.bytecode.enhance.spi.UnloadedClass; @@ -9,7 +9,6 @@ import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; import org.hibernate.testing.bytecode.enhancement.CustomEnhancementContext; import org.hibernate.testing.bytecode.enhancement.EnhancerTestContext; import org.hibernate.testing.bytecode.enhancement.EnhancerTestUtils; -import org.junit.Assume; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/ObjectAttributeMarkerInterceptor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ObjectAttributeMarkerInterceptor.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/ObjectAttributeMarkerInterceptor.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ObjectAttributeMarkerInterceptor.java index 4f4ed9f618..5904baf94e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/basic/ObjectAttributeMarkerInterceptor.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ObjectAttributeMarkerInterceptor.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.test.bytecode.enhancement.basic; +package org.hibernate.orm.test.bytecode.enhancement.basic; import org.hibernate.engine.spi.PersistentAttributeInterceptor; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/detached/DetachedGetIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/DetachedGetIdentifierTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/detached/DetachedGetIdentifierTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/DetachedGetIdentifierTest.java index 1a85ecbb75..d1b9c8a53f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/detached/DetachedGetIdentifierTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/DetachedGetIdentifierTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.bytecode.enhancement.detached; +package org.hibernate.orm.test.bytecode.enhancement.detached; import org.hibernate.SessionFactory; import org.hibernate.testing.TestForIssue; @@ -46,7 +46,7 @@ public class DetachedGetIdentifierTest extends BaseCoreFunctionalTestCase { // --- // - @Entity + @Entity(name = "SimpleEntity") @Table( name = "SIMPLE_ENTITY" ) private static class SimpleEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/dirty/DirtyTrackingCollectionInDefaultFetchGroupTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionInDefaultFetchGroupTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/dirty/DirtyTrackingCollectionInDefaultFetchGroupTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionInDefaultFetchGroupTest.java index 31e46e540d..c19c4d28cb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/dirty/DirtyTrackingCollectionInDefaultFetchGroupTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionInDefaultFetchGroupTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.dirty; +package org.hibernate.orm.test.bytecode.enhancement.dirty; import java.util.ArrayList; import java.util.Arrays; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/dirty/DirtyTrackingCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/dirty/DirtyTrackingCollectionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionTest.java index 5b1c30927e..b4e980eabf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/dirty/DirtyTrackingCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.dirty; +package org.hibernate.orm.test.bytecode.enhancement.dirty; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/dirty/DirtyTrackingNonUpdateableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingNonUpdateableTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/dirty/DirtyTrackingNonUpdateableTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingNonUpdateableTest.java index daa4197291..7ed375796c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/dirty/DirtyTrackingNonUpdateableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingNonUpdateableTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.dirty; +package org.hibernate.orm.test.bytecode.enhancement.dirty; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/dirty/DirtyTrackingPersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingPersistTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/dirty/DirtyTrackingPersistTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingPersistTest.java index f88d4beb6e..a92ec41081 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/dirty/DirtyTrackingPersistTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingPersistTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.dirty; +package org.hibernate.orm.test.bytecode.enhancement.dirty; import java.util.ArrayList; import java.util.Collections; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/dirty/DirtyTrackingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/dirty/DirtyTrackingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingTest.java index af037f8741..49dafbdde0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/dirty/DirtyTrackingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.dirty; +package org.hibernate.orm.test.bytecode.enhancement.dirty; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; import org.hibernate.testing.bytecode.enhancement.EnhancerTestUtils; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/eviction/EvictionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/eviction/EvictionTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/eviction/EvictionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/eviction/EvictionTest.java index c4fb1f42af..4cb552cd66 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/eviction/EvictionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/eviction/EvictionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.eviction; +package org.hibernate.orm.test.bytecode.enhancement.eviction; import org.hibernate.engine.spi.ManagedEntity; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyBasicFieldNotInitializedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyBasicFieldNotInitializedTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyBasicFieldNotInitializedTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyBasicFieldNotInitializedTest.java index 2d1bc80339..e1d91879f2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyBasicFieldNotInitializedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyBasicFieldNotInitializedTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.lazy; +package org.hibernate.orm.test.bytecode.enhancement.lazy; import javax.persistence.Basic; import javax.persistence.Entity; @@ -82,7 +82,7 @@ public class LazyBasicFieldNotInitializedTest extends BaseCoreFunctionalTestCase // --- // - @Entity + @Entity(name = "TestEntity") @Table( name = "TEST_ENTITY" ) private static class TestEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java index fa05b01ada..6b0ecd704b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.lazy; +package org.hibernate.orm.test.bytecode.enhancement.lazy; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyCollectionDetachTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDetachTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyCollectionDetachTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDetachTest.java index 869bfd01ae..98a1c9ab96 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyCollectionDetachTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDetachTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.lazy; +package org.hibernate.orm.test.bytecode.enhancement.lazy; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.not; @@ -109,7 +109,7 @@ public class LazyCollectionDetachTest extends BaseCoreFunctionalTestCase { } - @Entity + @Entity(name = "Parent") @Table(name = "PARENT") private static class Parent { @@ -125,7 +125,7 @@ public class LazyCollectionDetachTest extends BaseCoreFunctionalTestCase { } } - @Entity + @Entity(name = "Child") @Table(name = "CHILD") private static class Child { diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyInitializationWithoutInlineDirtyTrackingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyInitializationWithoutInlineDirtyTrackingTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyInitializationWithoutInlineDirtyTrackingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyInitializationWithoutInlineDirtyTrackingTest.java index 669b2f7ba6..330969b245 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyInitializationWithoutInlineDirtyTrackingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyInitializationWithoutInlineDirtyTrackingTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.lazy; +package org.hibernate.orm.test.bytecode.enhancement.lazy; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java index 05a50eb050..c92b331eae 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.lazy; +package org.hibernate.orm.test.bytecode.enhancement.lazy; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyOneToManyWithEqualsImplementationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyOneToManyWithEqualsImplementationTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyOneToManyWithEqualsImplementationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyOneToManyWithEqualsImplementationTest.java index 68dc27fca5..a2e0943ef8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyOneToManyWithEqualsImplementationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyOneToManyWithEqualsImplementationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.lazy; +package org.hibernate.orm.test.bytecode.enhancement.lazy; import org.hibernate.annotations.LazyToOne; import org.hibernate.annotations.LazyToOneOption; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyProxyOnEnhancedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyProxyOnEnhancedEntityTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyProxyOnEnhancedEntityTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyProxyOnEnhancedEntityTest.java index cf3edb0384..6f90bc7027 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/LazyProxyOnEnhancedEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyProxyOnEnhancedEntityTest.java @@ -4,11 +4,10 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.lazy; +package org.hibernate.orm.test.bytecode.enhancement.lazy; import org.hibernate.HibernateException; import org.hibernate.bytecode.enhance.spi.UnloadedClass; -import org.hibernate.event.internal.DefaultFlushEventListener; import org.hibernate.event.service.spi.EventListenerRegistry; import org.hibernate.event.spi.EventType; import org.hibernate.event.spi.LoadEvent; @@ -86,7 +85,7 @@ public class LazyProxyOnEnhancedEntityTest extends BaseCoreFunctionalTestCase { // --- // - @Entity + @Entity(name = "Parent") @Table( name = "PARENT" ) private static class Parent { @@ -111,7 +110,7 @@ public class LazyProxyOnEnhancedEntityTest extends BaseCoreFunctionalTestCase { } } - @Entity + @Entity(name = "Child") @Table( name = "CHILD" ) private static class Child { diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/cache/LazyInCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/LazyInCacheTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/cache/LazyInCacheTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/LazyInCacheTest.java index e2bac4a053..8af8bd810e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/cache/LazyInCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/LazyInCacheTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.lazy.cache; +package org.hibernate.orm.test.bytecode.enhancement.lazy.cache; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; @@ -77,7 +77,7 @@ public class LazyInCacheTest extends BaseCoreFunctionalTestCase { // --- // - @Entity + @Entity(name = "Order") @Table( name = "ORDER_TABLE" ) @Cache( usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE ) private static class Order { @@ -97,7 +97,7 @@ public class LazyInCacheTest extends BaseCoreFunctionalTestCase { byte[] data; } - @Entity + @Entity(name = "Product") @Table( name = "PRODUCT" ) private static class Product { @@ -108,7 +108,7 @@ public class LazyInCacheTest extends BaseCoreFunctionalTestCase { String name; } - @Entity + @Entity(name = "Tag") @Table( name = "TAG" ) private static class Tag { diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java index 53830b12fc..a3e872d4fd 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.bytecode.enhancement.lazy.cache; +package org.hibernate.orm.test.bytecode.enhancement.lazy.cache; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/cache/UninitializedLazyBasicCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedLazyBasicCacheTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/cache/UninitializedLazyBasicCacheTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedLazyBasicCacheTest.java index 1152423920..655b5368d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/cache/UninitializedLazyBasicCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/cache/UninitializedLazyBasicCacheTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.lazy.cache; +package org.hibernate.orm.test.bytecode.enhancement.lazy.cache; import javax.persistence.Basic; import javax.persistence.Cacheable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java index 39c062be81..906ed6438c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java @@ -11,7 +11,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.test.bytecode.enhancement.lazy.proxy; +package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MappedSuperclassWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MappedSuperclassWithEmbeddableTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MappedSuperclassWithEmbeddableTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MappedSuperclassWithEmbeddableTest.java index 5fb7877e7c..c566baaeaf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MappedSuperclassWithEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MappedSuperclassWithEmbeddableTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.test.bytecode.enhancement.lazy.proxy; +package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy; import java.io.Serializable; import java.util.Objects; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ProxyDeletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyDeletionTest.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ProxyDeletionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyDeletionTest.java index 2372a4a6a6..64c40c3dee 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/ProxyDeletionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyDeletionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.test.bytecode.enhancement.lazy.proxy; +package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy; import java.sql.Blob; import java.util.HashSet; @@ -30,6 +30,15 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; +import org.hibernate.test.bytecode.enhancement.lazy.proxy.AbstractKey; +import org.hibernate.test.bytecode.enhancement.lazy.proxy.Activity; +import org.hibernate.test.bytecode.enhancement.lazy.proxy.GenericKey; +import org.hibernate.test.bytecode.enhancement.lazy.proxy.Instruction; +import org.hibernate.test.bytecode.enhancement.lazy.proxy.MoreSpecializedKey; +import org.hibernate.test.bytecode.enhancement.lazy.proxy.RoleEntity; +import org.hibernate.test.bytecode.enhancement.lazy.proxy.SpecializedEntity; +import org.hibernate.test.bytecode.enhancement.lazy.proxy.SpecializedKey; +import org.hibernate.test.bytecode.enhancement.lazy.proxy.WebApplication; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SharingReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SharingReferenceTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SharingReferenceTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SharingReferenceTest.java index 44adcf1bcc..d2bb914c34 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SharingReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SharingReferenceTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.lazy.proxy; +package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java index 2e0ebab3bf..1934f780b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking; +package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking; import java.util.ArrayList; import java.util.Collections; @@ -26,6 +26,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; import org.hibernate.testing.bytecode.enhancement.CustomEnhancementContext; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; +import org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking.DirtyCheckEnhancementContext; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java index 86f0ee7727..91eb3b7bca 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking; +package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking; import java.util.ArrayList; @@ -26,6 +26,8 @@ import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; import org.hibernate.testing.bytecode.enhancement.CustomEnhancementContext; +import org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking.DirtyCheckEnhancementContext; +import org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking.NoDirtyCheckEnhancementContext; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java index 123f672a31..066d8080af 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking; +package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking; import java.util.ArrayList; import java.util.List; @@ -19,6 +19,8 @@ import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; import org.hibernate.testing.bytecode.enhancement.CustomEnhancementContext; +import org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking.DirtyCheckEnhancementContext; +import org.hibernate.test.bytecode.enhancement.lazy.proxy.inlinedirtychecking.NoDirtyCheckEnhancementContext; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/CompositeMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/CompositeMergeTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/CompositeMergeTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/CompositeMergeTest.java index aa7686ab8c..8b53e58d22 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/CompositeMergeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/CompositeMergeTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.merge; +package org.hibernate.orm.test.bytecode.enhancement.merge; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; @@ -103,7 +103,7 @@ public class CompositeMergeTest extends BaseCoreFunctionalTestCase { // --- // - @Entity + @Entity(name = "Parent") @Table( name = "PARENT_ENTITY" ) private static class ParentEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/Leaf.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Leaf.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/Leaf.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Leaf.java index 6c3d1261ce..4ede7ab40e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/Leaf.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Leaf.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.merge; +package org.hibernate.orm.test.bytecode.enhancement.merge; import javax.persistence.Access; import javax.persistence.AccessType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeDetachedCascadedCollectionInEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedCascadedCollectionInEmbeddableTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeDetachedCascadedCollectionInEmbeddableTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedCascadedCollectionInEmbeddableTest.java index 135ed19661..8649d9d95c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeDetachedCascadedCollectionInEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedCascadedCollectionInEmbeddableTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.merge; +package org.hibernate.orm.test.bytecode.enhancement.merge; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeDetachedNonCascadedCollectionInEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedNonCascadedCollectionInEmbeddableTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeDetachedNonCascadedCollectionInEmbeddableTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedNonCascadedCollectionInEmbeddableTest.java index ce83fa5dac..a2cb984b9b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeDetachedNonCascadedCollectionInEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedNonCascadedCollectionInEmbeddableTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.merge; +package org.hibernate.orm.test.bytecode.enhancement.merge; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeEnhancedDetachedOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedDetachedOrphanRemovalTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeEnhancedDetachedOrphanRemovalTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedDetachedOrphanRemovalTest.java index 3b56a6bae8..eae8f99bca 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeEnhancedDetachedOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedDetachedOrphanRemovalTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.merge; +package org.hibernate.orm.test.bytecode.enhancement.merge; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeEnhancedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeEnhancedEntityTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityTest.java index 6727344282..f554414f84 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeEnhancedEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.merge; +package org.hibernate.orm.test.bytecode.enhancement.merge; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/Root.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Root.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/Root.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Root.java index 3591f2fffa..3c5dc1d65f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/Root.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/Root.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.merge; +package org.hibernate.orm.test.bytecode.enhancement.merge; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/mutable/MapStringConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/MapStringConverter.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/mutable/MapStringConverter.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/MapStringConverter.java index 8f43918de5..f342b35f9d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/mutable/MapStringConverter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/MapStringConverter.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.test.bytecode.enhancement.mutable; +package org.hibernate.orm.test.bytecode.enhancement.mutable; import java.util.HashMap; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/mutable/MutableTypeEnhancementTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/MutableTypeEnhancementTestCase.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/mutable/MutableTypeEnhancementTestCase.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/MutableTypeEnhancementTestCase.java index 9044b32c29..618720fc04 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/mutable/MutableTypeEnhancementTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/MutableTypeEnhancementTestCase.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.test.bytecode.enhancement.mutable; +package org.hibernate.orm.test.bytecode.enhancement.mutable; import java.util.Date; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/mutable/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/TestEntity.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/mutable/TestEntity.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/TestEntity.java index cb99d834b1..5c0c74892f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/mutable/TestEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/mutable/TestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.test.bytecode.enhancement.mutable; +package org.hibernate.orm.test.bytecode.enhancement.mutable; import java.util.Date; import java.util.HashMap; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/otherentityentrycontext/OtherEntityEntryContextTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/otherentityentrycontext/OtherEntityEntryContextTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/otherentityentrycontext/OtherEntityEntryContextTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/otherentityentrycontext/OtherEntityEntryContextTest.java index 1acdba1663..b6c01126a1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/otherentityentrycontext/OtherEntityEntryContextTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/otherentityentrycontext/OtherEntityEntryContextTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.otherentityentrycontext; +package org.hibernate.orm.test.bytecode.enhancement.otherentityentrycontext; import org.hibernate.HibernateException; import org.hibernate.engine.spi.ManagedEntity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/pk/EmbeddedPKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/pk/EmbeddedPKTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/pk/EmbeddedPKTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/pk/EmbeddedPKTest.java index f0a20b5d41..7a7e814b7e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/pk/EmbeddedPKTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/pk/EmbeddedPKTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.pk; +package org.hibernate.orm.test.bytecode.enhancement.pk; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/tracker/CompositeOwnerTrackerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/tracker/CompositeOwnerTrackerTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/tracker/CompositeOwnerTrackerTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/tracker/CompositeOwnerTrackerTest.java index f467f40974..b621fd3fe3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/tracker/CompositeOwnerTrackerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/tracker/CompositeOwnerTrackerTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.tracker; +package org.hibernate.orm.test.bytecode.enhancement.tracker; import org.hibernate.bytecode.enhance.internal.tracker.CompositeOwnerTracker; import org.hibernate.engine.spi.CompositeOwner; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/tracker/DirtyTrackerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/tracker/DirtyTrackerTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/tracker/DirtyTrackerTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/tracker/DirtyTrackerTest.java index 13ada0f66a..afb773fb2b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/tracker/DirtyTrackerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/tracker/DirtyTrackerTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.bytecode.enhancement.tracker; +package org.hibernate.orm.test.bytecode.enhancement.tracker; import org.hibernate.bytecode.enhance.internal.tracker.DirtyTracker; import org.hibernate.bytecode.enhance.internal.tracker.SimpleFieldTracker; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CfgFilePropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CfgFilePropertyTest.java index 7084a0220d..8595dfe425 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CfgFilePropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CfgFilePropertyTest.java @@ -37,7 +37,7 @@ public class CfgFilePropertyTest extends BaseUnitTestCase { Thread thread = new Thread( () -> { try { final Properties props = new Properties(); - props.setProperty( AvailableSettings.CFG_FILE, "/org/hibernate/test/boot/cfgXml/hibernate.cfg.xml" ); + props.setProperty( AvailableSettings.CFG_FILE, "/org/hibernate/orm/test/boot/cfgXml/hibernate.cfg.xml" ); Persistence.createEntityManagerFactory( "ExcludeUnlistedClassesTest1", props ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/SuppliedConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/SuppliedConnectionTest.java index 52d1fd7a25..70f3c73fee 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/SuppliedConnectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/SuppliedConnectionTest.java @@ -27,7 +27,7 @@ import org.hibernate.testing.AfterClassOnce; import org.hibernate.testing.BeforeClassOnce; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.env.ConnectionProviderBuilder; -import org.hibernate.test.util.DdlTransactionIsolatorTestingImpl; +import org.hibernate.orm.test.util.DdlTransactionIsolatorTestingImpl; /** * Implementation of SuppliedConnectionTest. diff --git a/hibernate-core/src/test/java/org/hibernate/test/id/idClass/IdClassNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/IdClassNamingStrategyTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/id/idClass/IdClassNamingStrategyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/IdClassNamingStrategyTest.java index d9a9270b6d..2b71de3576 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/id/idClass/IdClassNamingStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/IdClassNamingStrategyTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.id.idClass; +package org.hibernate.orm.test.id.idClass; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-core/src/test/java/org/hibernate/test/id/idClass/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/MyEntity.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/id/idClass/MyEntity.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/MyEntity.java index 1bc1ea6dfa..89c1f5d3f8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/id/idClass/MyEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/MyEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.id.idClass; +package org.hibernate.orm.test.id.idClass; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/id/idClass/MyEntityId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/MyEntityId.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/id/idClass/MyEntityId.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/MyEntityId.java index 175d3e2515..7f9d5c9031 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/id/idClass/MyEntityId.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/idClass/MyEntityId.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.id.idClass; +package org.hibernate.orm.test.id.idClass; import java.io.Serializable; import java.util.Objects; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BaseInsertOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BaseInsertOrderingTest.java index 434e49abf7..38d20ed645 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BaseInsertOrderingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/BaseInsertOrderingTest.java @@ -7,11 +7,11 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; +import org.hibernate.orm.test.util.jdbc.PreparedStatementSpyConnectionProvider; import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.RequiresDialectFeature; -import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider; import org.junit.jupiter.api.AfterAll; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/AggressiveReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/AggressiveReleaseTest.java index 4f48c825f8..735f56ea9f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/AggressiveReleaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/AggressiveReleaseTest.java @@ -21,7 +21,7 @@ import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode; import org.hibernate.testing.boot.BasicTestingJdbcServiceImpl; import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest; import org.hibernate.testing.orm.junit.RequiresDialect; -import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider; +import org.hibernate.orm.test.util.jdbc.PreparedStatementSpyConnectionProvider; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/SessionJdbcBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/SessionJdbcBatchTest.java index 0ad88fbffb..b6394be2e3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/SessionJdbcBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/SessionJdbcBatchTest.java @@ -20,7 +20,7 @@ import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider; +import org.hibernate.orm.test.util.jdbc.PreparedStatementSpyConnectionProvider; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/DisableDiscardPersistenceContextOnCloseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/DisableDiscardPersistenceContextOnCloseTest.java index a4d14e535b..baf1c56d40 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/DisableDiscardPersistenceContextOnCloseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/DisableDiscardPersistenceContextOnCloseTest.java @@ -8,17 +8,16 @@ package org.hibernate.orm.test.jpa.ejb3configuration; import java.sql.SQLException; import java.util.Map; -import javax.persistence.EntityManager; import org.hibernate.jpa.AvailableSettings; import org.hibernate.jpa.test.Wallet; -import org.hibernate.testing.DialectChecks; -import org.hibernate.testing.RequiresDialectFeature; +import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; +import org.hibernate.testing.orm.junit.RequiresDialectFeature; import org.hibernate.testing.orm.junit.Setting; -import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider; +import org.hibernate.orm.test.util.jdbc.PreparedStatementSpyConnectionProvider; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -30,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Vlad Mihalcea */ -@RequiresDialectFeature(DialectChecks.SupportsJdbcDriverProxying.class) +@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJdbcDriverProxying.class) @Jpa( annotatedClasses = { Wallet.class }, integrationSettings = { @Setting( name = AvailableSettings.DISCARD_PC_ON_CLOSE, value = "false") }, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EnableDiscardPersistenceContextOnCloseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EnableDiscardPersistenceContextOnCloseTest.java index 8051076917..3786df9fc9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EnableDiscardPersistenceContextOnCloseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EnableDiscardPersistenceContextOnCloseTest.java @@ -11,12 +11,12 @@ import java.util.Map; import org.hibernate.jpa.AvailableSettings; import org.hibernate.jpa.test.Wallet; -import org.hibernate.testing.DialectChecks; -import org.hibernate.testing.RequiresDialectFeature; +import org.hibernate.testing.orm.junit.DialectFeatureChecks; +import org.hibernate.testing.orm.junit.RequiresDialectFeature; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Setting; -import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider; +import org.hibernate.orm.test.util.jdbc.PreparedStatementSpyConnectionProvider; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * @author Vlad Mihalcea */ -@RequiresDialectFeature(DialectChecks.SupportsJdbcDriverProxying.class) +@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJdbcDriverProxying.class) @Jpa( annotatedClasses = { Wallet.class }, integrationSettings = { @Setting(name = AvailableSettings.DISCARD_PC_ON_CLOSE, value = "true") }, diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PreparedStatementSpyConnectionProviderSettingValueProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PreparedStatementSpyConnectionProviderSettingValueProvider.java index 5dfb8de628..35689c6f79 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PreparedStatementSpyConnectionProviderSettingValueProvider.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PreparedStatementSpyConnectionProviderSettingValueProvider.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.jpa.ejb3configuration; import org.hibernate.testing.orm.jpa.NonStringValueSettingProvider; -import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider; +import org.hibernate.orm.test.util.jdbc.PreparedStatementSpyConnectionProvider; /** * @author Jan Schatteman diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/common/DatabaseConnectionInfo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/DatabaseConnectionInfo.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/resource/common/DatabaseConnectionInfo.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/DatabaseConnectionInfo.java index 5e263a6c79..c2b37fd038 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/common/DatabaseConnectionInfo.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/DatabaseConnectionInfo.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.common; +package org.hibernate.orm.test.resource.common; import java.sql.Connection; import java.sql.Driver; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/common/SynchronizationCollectorImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationCollectorImpl.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/resource/common/SynchronizationCollectorImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationCollectorImpl.java index f105b5d2f7..e63e7af98a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/common/SynchronizationCollectorImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationCollectorImpl.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.common; +package org.hibernate.orm.test.resource.common; import javax.transaction.Status; import javax.transaction.Synchronization; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/common/SynchronizationErrorImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationErrorImpl.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/resource/common/SynchronizationErrorImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationErrorImpl.java index 63c43e4156..fd374b5ef0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/common/SynchronizationErrorImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/common/SynchronizationErrorImpl.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.common; +package org.hibernate.orm.test.resource.common; import javax.transaction.Synchronization; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/LegacySettingInitiatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/LegacySettingInitiatorTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/LegacySettingInitiatorTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/LegacySettingInitiatorTest.java index e66268d40a..20a33e5727 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/LegacySettingInitiatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/LegacySettingInitiatorTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.transaction; +package org.hibernate.orm.test.resource.transaction; import java.util.Collections; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/SynchronizationRegistryStandardImplTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/SynchronizationRegistryStandardImplTests.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/SynchronizationRegistryStandardImplTests.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/SynchronizationRegistryStandardImplTests.java index 9b0dc408cd..2b21f04f58 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/SynchronizationRegistryStandardImplTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/SynchronizationRegistryStandardImplTests.java @@ -4,17 +4,17 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.transaction; +package org.hibernate.orm.test.resource.transaction; import javax.transaction.Status; import javax.transaction.Synchronization; +import org.hibernate.orm.test.resource.common.SynchronizationCollectorImpl; +import org.hibernate.orm.test.resource.common.SynchronizationErrorImpl; import org.hibernate.resource.transaction.LocalSynchronizationException; import org.hibernate.resource.transaction.NullSynchronizationException; import org.hibernate.resource.transaction.internal.SynchronizationRegistryStandardImpl; -import org.hibernate.test.resource.common.SynchronizationCollectorImpl; -import org.hibernate.test.resource.common.SynchronizationErrorImpl; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/AlreadyStartedTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/AlreadyStartedTransactionTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/AlreadyStartedTransactionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/AlreadyStartedTransactionTest.java index 9ec157d08b..98b61bfb5c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/AlreadyStartedTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/AlreadyStartedTransactionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.test.resource.transaction.jdbc; +package org.hibernate.orm.test.resource.transaction.jdbc; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/BasicJdbcTransactionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/BasicJdbcTransactionTests.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/BasicJdbcTransactionTests.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/BasicJdbcTransactionTests.java index cc894366ed..bf4e30ae82 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/BasicJdbcTransactionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/BasicJdbcTransactionTests.java @@ -4,27 +4,22 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.transaction.jdbc; +package org.hibernate.orm.test.resource.transaction.jdbc; import org.hibernate.TransactionException; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.engine.jdbc.internal.JdbcCoordinatorImpl; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.resource.transaction.backend.jdbc.internal.JdbcResourceLocalTransactionCoordinatorBuilderImpl; +import org.hibernate.orm.test.resource.common.SynchronizationCollectorImpl; +import org.hibernate.orm.test.resource.common.SynchronizationErrorImpl; import org.hibernate.resource.transaction.spi.TransactionCoordinator; -import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder; import org.hibernate.resource.transaction.spi.TransactionStatus; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.resource.common.SynchronizationCollectorImpl; -import org.hibernate.test.resource.common.SynchronizationErrorImpl; import org.junit.Test; -import org.hamcrest.CoreMatchers; - import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/LogicalConnectionTestingImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/LogicalConnectionTestingImpl.java similarity index 83% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/LogicalConnectionTestingImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/LogicalConnectionTestingImpl.java index 11a5bb8df9..e489fd027e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/LogicalConnectionTestingImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/LogicalConnectionTestingImpl.java @@ -4,13 +4,12 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.transaction.jdbc; +package org.hibernate.orm.test.resource.transaction.jdbc; +import org.hibernate.orm.test.resource.common.DatabaseConnectionInfo; import org.hibernate.resource.jdbc.internal.LogicalConnectionProvidedImpl; import org.hibernate.resource.jdbc.internal.ResourceRegistryStandardImpl; -import org.hibernate.test.resource.common.DatabaseConnectionInfo; - /** * @author Steve Ebersole */ diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/TransactionCoordinatorOwnerTestingImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/TransactionCoordinatorOwnerTestingImpl.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/TransactionCoordinatorOwnerTestingImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/TransactionCoordinatorOwnerTestingImpl.java index 6b6d06d12b..22ecf40e9d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/TransactionCoordinatorOwnerTestingImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/TransactionCoordinatorOwnerTestingImpl.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.transaction.jdbc; +package org.hibernate.orm.test.resource.transaction.jdbc; import org.hibernate.HibernateException; import org.hibernate.resource.jdbc.spi.JdbcSessionOwner; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/AbstractSkipAutoCommitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/AbstractSkipAutoCommitTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/AbstractSkipAutoCommitTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/AbstractSkipAutoCommitTest.java index f7371903ff..7e2a858a84 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/AbstractSkipAutoCommitTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/AbstractSkipAutoCommitTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.transaction.jdbc.autocommit; +package org.hibernate.orm.test.resource.transaction.jdbc.autocommit; import java.sql.Connection; import java.sql.SQLException; @@ -19,7 +19,7 @@ import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; -import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider; +import org.hibernate.orm.test.util.jdbc.PreparedStatementSpyConnectionProvider; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/H2SkipAutoCommitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/H2SkipAutoCommitTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/H2SkipAutoCommitTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/H2SkipAutoCommitTest.java index cb10242769..2815fed2f9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/H2SkipAutoCommitTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/H2SkipAutoCommitTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.transaction.jdbc.autocommit; +package org.hibernate.orm.test.resource.transaction.jdbc.autocommit; import javax.sql.DataSource; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/MySQLSkipAutoCommitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/MySQLSkipAutoCommitTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/MySQLSkipAutoCommitTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/MySQLSkipAutoCommitTest.java index a417dc99fb..526fdb5c3f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/MySQLSkipAutoCommitTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/MySQLSkipAutoCommitTest.java @@ -4,14 +4,13 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.transaction.jdbc.autocommit; +package org.hibernate.orm.test.resource.transaction.jdbc.autocommit; import javax.sql.DataSource; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; import org.hibernate.dialect.MariaDBDialect; -import org.hibernate.dialect.MySQL8Dialect; import org.hibernate.dialect.MySQLDialect; import org.hibernate.testing.RequiresDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/OracleSkipAutoCommitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/OracleSkipAutoCommitTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/OracleSkipAutoCommitTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/OracleSkipAutoCommitTest.java index e6a7bc195d..58577f45e8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/OracleSkipAutoCommitTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/OracleSkipAutoCommitTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.transaction.jdbc.autocommit; +package org.hibernate.orm.test.resource.transaction.jdbc.autocommit; import javax.sql.DataSource; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/PostgreSQLSkipAutoCommitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/PostgreSQLSkipAutoCommitTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/PostgreSQLSkipAutoCommitTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/PostgreSQLSkipAutoCommitTest.java index fda7ec9e77..356cf50624 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/PostgreSQLSkipAutoCommitTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/PostgreSQLSkipAutoCommitTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.transaction.jdbc.autocommit; +package org.hibernate.orm.test.resource.transaction.jdbc.autocommit; import javax.sql.DataSource; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/SQLServerSkipAutoCommitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/SQLServerSkipAutoCommitTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/SQLServerSkipAutoCommitTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/SQLServerSkipAutoCommitTest.java index e68f4842e6..f138ac3441 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/SQLServerSkipAutoCommitTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/SQLServerSkipAutoCommitTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.transaction.jdbc.autocommit; +package org.hibernate.orm.test.resource.transaction.jdbc.autocommit; import javax.sql.DataSource; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/AbstractBasicJtaTestScenarios.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/AbstractBasicJtaTestScenarios.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/AbstractBasicJtaTestScenarios.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/AbstractBasicJtaTestScenarios.java index ac2791c066..829cbe696b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/AbstractBasicJtaTestScenarios.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/AbstractBasicJtaTestScenarios.java @@ -4,21 +4,21 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.transaction.jta; +package org.hibernate.orm.test.resource.transaction.jta; import javax.transaction.Status; import javax.transaction.SystemException; import javax.transaction.TransactionManager; import org.hibernate.TransactionException; +import org.hibernate.orm.test.resource.common.SynchronizationCollectorImpl; import org.hibernate.resource.transaction.TransactionRequiredForJoinException; import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorBuilderImpl; import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorImpl; import org.hibernate.resource.transaction.backend.jta.internal.synchronization.SynchronizationCallbackCoordinatorTrackingImpl; import org.hibernate.resource.transaction.spi.TransactionStatus; -import org.hibernate.test.resource.common.SynchronizationCollectorImpl; -import org.hibernate.test.resource.common.SynchronizationErrorImpl; +import org.hibernate.orm.test.resource.common.SynchronizationErrorImpl; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/BasicJtaTransactionManagerTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/BasicJtaTransactionManagerTests.java similarity index 76% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/BasicJtaTransactionManagerTests.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/BasicJtaTransactionManagerTests.java index c33bd4c4fb..bd54290f1c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/BasicJtaTransactionManagerTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/BasicJtaTransactionManagerTests.java @@ -4,9 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.transaction.jta; - -import org.hibernate.test.resource.transaction.jta.AbstractBasicJtaTestScenarios; +package org.hibernate.orm.test.resource.transaction.jta; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/BasicJtaUserTransactionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/BasicJtaUserTransactionTests.java similarity index 76% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/BasicJtaUserTransactionTests.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/BasicJtaUserTransactionTests.java index b6bb570b2f..40fc3f5475 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/BasicJtaUserTransactionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/BasicJtaUserTransactionTests.java @@ -4,9 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.transaction.jta; - -import org.hibernate.test.resource.transaction.jta.AbstractBasicJtaTestScenarios; +package org.hibernate.orm.test.resource.transaction.jta; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/InaccessibleJtaPlatformTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/InaccessibleJtaPlatformTests.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/InaccessibleJtaPlatformTests.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/InaccessibleJtaPlatformTests.java index b2f4cda74e..ef5afe612d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/InaccessibleJtaPlatformTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/InaccessibleJtaPlatformTests.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.transaction.jta; +package org.hibernate.orm.test.resource.transaction.jta; import org.hibernate.resource.transaction.backend.jta.internal.JtaPlatformInaccessibleException; import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorBuilderImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/JpaComplianceAlreadyStartedTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JpaComplianceAlreadyStartedTransactionTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/JpaComplianceAlreadyStartedTransactionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JpaComplianceAlreadyStartedTransactionTest.java index ac12f10b34..8b34914241 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/JpaComplianceAlreadyStartedTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JpaComplianceAlreadyStartedTransactionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.test.resource.transaction.jta; +package org.hibernate.orm.test.resource.transaction.jta; import java.util.Map; import javax.transaction.Status; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/JtaPlatformInaccessibleImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformInaccessibleImpl.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/JtaPlatformInaccessibleImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformInaccessibleImpl.java index 606dbe8e47..274ecb76c8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/JtaPlatformInaccessibleImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformInaccessibleImpl.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.transaction.jta; +package org.hibernate.orm.test.resource.transaction.jta; import javax.transaction.Status; import javax.transaction.Synchronization; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/JtaPlatformStandardTestingImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformStandardTestingImpl.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/JtaPlatformStandardTestingImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformStandardTestingImpl.java index eef52e56df..27db51b835 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/JtaPlatformStandardTestingImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/JtaPlatformStandardTestingImpl.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.transaction.jta; +package org.hibernate.orm.test.resource.transaction.jta; import javax.transaction.Status; import javax.transaction.SystemException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/NonJpaComplianceAlreadyStartedTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/NonJpaComplianceAlreadyStartedTransactionTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/NonJpaComplianceAlreadyStartedTransactionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/NonJpaComplianceAlreadyStartedTransactionTest.java index 78e501c6f2..214cbc2e09 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/NonJpaComplianceAlreadyStartedTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/NonJpaComplianceAlreadyStartedTransactionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.test.resource.transaction.jta; +package org.hibernate.orm.test.resource.transaction.jta; import java.util.Map; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/TransactionCoordinatorOwnerTestingImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/TransactionCoordinatorOwnerTestingImpl.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/TransactionCoordinatorOwnerTestingImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/TransactionCoordinatorOwnerTestingImpl.java index d43d363173..11638376b6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jta/TransactionCoordinatorOwnerTestingImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/TransactionCoordinatorOwnerTestingImpl.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.resource.transaction.jta; +package org.hibernate.orm.test.resource.transaction.jta; import org.hibernate.resource.jdbc.spi.JdbcSessionOwner; import org.hibernate.resource.transaction.spi.TransactionCoordinatorOwner; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemafilter/CatalogFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/CatalogFilterTest.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/schemafilter/CatalogFilterTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/CatalogFilterTest.java index e0ddd251d3..5274fc8576 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemafilter/CatalogFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/CatalogFilterTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.schemafilter; +package org.hibernate.orm.test.schemafilter; import java.util.Arrays; import java.util.HashMap; @@ -33,9 +33,6 @@ import org.junit.Test; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; -import static org.hibernate.test.schemafilter.RecordingTarget.Category.TABLE_CREATE; -import static org.hibernate.test.schemafilter.RecordingTarget.Category.TABLE_DROP; - @SuppressWarnings({"rawtypes", "unchecked"}) @RequiresDialectFeature( value = {DialectChecks.SupportCatalogCreation.class}) public class CatalogFilterTest extends BaseUnitTestCase { @@ -64,7 +61,7 @@ public class CatalogFilterTest extends BaseUnitTestCase { public void createCatalog_unfiltered() { RecordingTarget target = doCreation( new DefaultSchemaFilter() ); - Assert.assertThat( target.getActions( TABLE_CREATE ), containsExactly( + Assert.assertThat( target.getActions( RecordingTarget.Category.TABLE_CREATE ), containsExactly( "the_entity_0", "the_catalog_1.the_entity_1", "the_catalog_1.the_entity_2", @@ -78,7 +75,7 @@ public class CatalogFilterTest extends BaseUnitTestCase { RecordingTarget target = doCreation( new TestSchemaFilter() ); Assert.assertThat( - target.getActions( TABLE_CREATE ), + target.getActions( RecordingTarget.Category.TABLE_CREATE ), containsExactly( "the_entity_0", "the_catalog_1.the_entity_1" ) ); } @@ -87,7 +84,7 @@ public class CatalogFilterTest extends BaseUnitTestCase { public void dropCatalog_unfiltered() { RecordingTarget target = doDrop( new DefaultSchemaFilter() ); - Assert.assertThat( target.getActions( TABLE_DROP ), containsExactly( + Assert.assertThat( target.getActions( RecordingTarget.Category.TABLE_DROP ), containsExactly( "the_entity_0", "the_catalog_1.the_entity_1", "the_catalog_1.the_entity_2", @@ -101,7 +98,7 @@ public class CatalogFilterTest extends BaseUnitTestCase { RecordingTarget target = doDrop( new TestSchemaFilter() ); Assert.assertThat( - target.getActions( TABLE_DROP ), + target.getActions( RecordingTarget.Category.TABLE_DROP ), containsExactly( "the_entity_0", "the_catalog_1.the_entity_1" ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemafilter/RecordingTarget.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/RecordingTarget.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/schemafilter/RecordingTarget.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/RecordingTarget.java index 59cc9ed9c3..ecb5c5a280 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemafilter/RecordingTarget.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/RecordingTarget.java @@ -1,4 +1,4 @@ -package org.hibernate.test.schemafilter; +package org.hibernate.orm.test.schemafilter; import java.util.EnumMap; import java.util.HashSet; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemafilter/SchemaFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SchemaFilterTest.java similarity index 85% rename from hibernate-core/src/test/java/org/hibernate/test/schemafilter/SchemaFilterTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SchemaFilterTest.java index 2a470bc6c8..e310a29d19 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemafilter/SchemaFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SchemaFilterTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.schemafilter; +package org.hibernate.orm.test.schemafilter; import java.util.Arrays; import java.util.HashMap; @@ -35,11 +35,6 @@ import org.junit.Test; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; -import static org.hibernate.test.schemafilter.RecordingTarget.Category.SCHEMA_CREATE; -import static org.hibernate.test.schemafilter.RecordingTarget.Category.SCHEMA_DROP; -import static org.hibernate.test.schemafilter.RecordingTarget.Category.TABLE_CREATE; -import static org.hibernate.test.schemafilter.RecordingTarget.Category.TABLE_DROP; - @TestForIssue(jiraKey = "HHH-9876") @SuppressWarnings({"rawtypes", "unchecked"}) @RequiresDialectFeature( value = {DialectChecks.SupportSchemaCreation.class}) @@ -74,8 +69,8 @@ public class SchemaFilterTest extends BaseUnitTestCase { public void createSchema_unfiltered() { RecordingTarget target = doCreation( new DefaultSchemaFilter() ); - Assert.assertThat( target.getActions( SCHEMA_CREATE ), containsExactly( "the_schema_1", "the_schema_2" ) ); - Assert.assertThat( target.getActions( TABLE_CREATE ), containsExactly( + Assert.assertThat( target.getActions( RecordingTarget.Category.SCHEMA_CREATE ), containsExactly( "the_schema_1", "the_schema_2" ) ); + Assert.assertThat( target.getActions( RecordingTarget.Category.TABLE_CREATE ), containsExactly( "the_entity_0", "the_schema_1.the_entity_1", "the_schema_1.the_entity_2", @@ -88,9 +83,9 @@ public class SchemaFilterTest extends BaseUnitTestCase { public void createSchema_filtered() { RecordingTarget target = doCreation( new TestSchemaFilter() ); - Assert.assertThat( target.getActions( SCHEMA_CREATE ), containsExactly( "the_schema_1" ) ); + Assert.assertThat( target.getActions( RecordingTarget.Category.SCHEMA_CREATE ), containsExactly( "the_schema_1" ) ); Assert.assertThat( - target.getActions( TABLE_CREATE ), + target.getActions( RecordingTarget.Category.TABLE_CREATE ), containsExactly( "the_entity_0", "the_schema_1.the_entity_1" ) ); } @@ -99,8 +94,8 @@ public class SchemaFilterTest extends BaseUnitTestCase { public void dropSchema_unfiltered() { RecordingTarget target = doDrop( new DefaultSchemaFilter() ); - Assert.assertThat( target.getActions( SCHEMA_DROP ), containsExactly( "the_schema_1", "the_schema_2" ) ); - Assert.assertThat( target.getActions( TABLE_DROP ), containsExactly( + Assert.assertThat( target.getActions( RecordingTarget.Category.SCHEMA_DROP ), containsExactly( "the_schema_1", "the_schema_2" ) ); + Assert.assertThat( target.getActions( RecordingTarget.Category.TABLE_DROP ), containsExactly( "the_entity_0", "the_schema_1.the_entity_1", "the_schema_1.the_entity_2", @@ -113,9 +108,9 @@ public class SchemaFilterTest extends BaseUnitTestCase { public void dropSchema_filtered() { RecordingTarget target = doDrop( new TestSchemaFilter() ); - Assert.assertThat( target.getActions( SCHEMA_DROP ), containsExactly( "the_schema_1" ) ); + Assert.assertThat( target.getActions( RecordingTarget.Category.SCHEMA_DROP ), containsExactly( "the_schema_1" ) ); Assert.assertThat( - target.getActions( TABLE_DROP ), + target.getActions( RecordingTarget.Category.TABLE_DROP ), containsExactly( "the_entity_0", "the_schema_1.the_entity_1" ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemafilter/SequenceFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SequenceFilterTest.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/schemafilter/SequenceFilterTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SequenceFilterTest.java index e794cd28b3..b51a08775a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemafilter/SequenceFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SequenceFilterTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemafilter; +package org.hibernate.orm.test.schemafilter; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -45,9 +45,6 @@ import org.hibernate.testing.ServiceRegistryBuilder; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseUnitTestCase; -import static org.hibernate.test.schemafilter.RecordingTarget.Category.SEQUENCE_CREATE; -import static org.hibernate.test.schemafilter.RecordingTarget.Category.SEQUENCE_DROP; - /** * @author Andrea Boriero */ @@ -81,7 +78,7 @@ public class SequenceFilterTest extends BaseUnitTestCase { public void createSchema_unfiltered() { RecordingTarget target = doCreation( new DefaultSchemaFilter() ); - Assert.assertThat( target.getActions( SEQUENCE_CREATE ), containsExactly( + Assert.assertThat( target.getActions( RecordingTarget.Category.SEQUENCE_CREATE ), containsExactly( "entity_1_seq_gen", "entity_2_seq_gen" ) ); @@ -91,7 +88,7 @@ public class SequenceFilterTest extends BaseUnitTestCase { public void createSchema_filtered() { RecordingTarget target = doCreation( new TestSchemaFilter() ); - Assert.assertThat( target.getActions( SEQUENCE_CREATE ), containsExactly( + Assert.assertThat( target.getActions( RecordingTarget.Category.SEQUENCE_CREATE ), containsExactly( "entity_1_seq_gen" ) ); } @@ -100,7 +97,7 @@ public class SequenceFilterTest extends BaseUnitTestCase { public void dropSchema_unfiltered() { RecordingTarget target = doDrop( new DefaultSchemaFilter() ); - Assert.assertThat( target.getActions( SEQUENCE_DROP ), containsExactly( + Assert.assertThat( target.getActions( RecordingTarget.Category.SEQUENCE_DROP ), containsExactly( "entity_1_seq_gen", "entity_2_seq_gen" ) ); @@ -111,7 +108,7 @@ public class SequenceFilterTest extends BaseUnitTestCase { RecordingTarget target = doDrop( new TestSchemaFilter() ); Assert.assertThat( - target.getActions( SEQUENCE_DROP ), + target.getActions( RecordingTarget.Category.SEQUENCE_DROP ), containsExactly( "entity_1_seq_gen" ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/test/schematools/TestExtraPhysicalTableTypes.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/TestExtraPhysicalTableTypes.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schematools/TestExtraPhysicalTableTypes.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schematools/TestExtraPhysicalTableTypes.java index 6547c7adf3..b2128ebfe4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schematools/TestExtraPhysicalTableTypes.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/TestExtraPhysicalTableTypes.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schematools; +package org.hibernate.orm.test.schematools; import java.sql.Connection; import java.sql.SQLException; @@ -30,7 +30,7 @@ import org.junit.After; import org.junit.Test; import org.hibernate.testing.TestForIssue; -import org.hibernate.test.util.DdlTransactionIsolatorTestingImpl; +import org.hibernate.orm.test.util.DdlTransactionIsolatorTestingImpl; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/1_Version.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/1_Version.hbm.xml similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/1_Version.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/1_Version.hbm.xml index 2588898574..e584ea471d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/1_Version.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/1_Version.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/2_Version.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/2_Version.hbm.xml similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/2_Version.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/2_Version.hbm.xml index aa453efa83..74f8917a10 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/2_Version.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/2_Version.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/3_Version.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/3_Version.hbm.xml similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/3_Version.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/3_Version.hbm.xml index e61e613bd6..0021fe4aba 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/3_Version.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/3_Version.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/AbstractAlterTableQuoteSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AbstractAlterTableQuoteSchemaTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/AbstractAlterTableQuoteSchemaTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AbstractAlterTableQuoteSchemaTest.java index 7d5ab1c526..b01378fbb2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/AbstractAlterTableQuoteSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AbstractAlterTableQuoteSchemaTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java index d3a7a7e266..aa4597e861 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.File; import java.io.IOException; @@ -23,7 +23,6 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; -import org.hibernate.dialect.Oracle8iDialect; import org.hibernate.dialect.PostgreSQL82Dialect; import org.hibernate.dialect.SQLServer2012Dialect; import org.hibernate.testing.DialectChecks; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java index e72b5a6a4c..9bee436efe 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.File; import java.io.IOException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/ColumnNamesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ColumnNamesTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/ColumnNamesTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ColumnNamesTest.java index 12fe47e72f..3f16133daa 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/ColumnNamesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ColumnNamesTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.File; import java.io.IOException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/CommentGeneration.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/CommentGeneration.hbm.xml similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/CommentGeneration.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/CommentGeneration.hbm.xml index d62f999ec5..0751093127 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/CommentGeneration.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/CommentGeneration.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/CommentGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/CommentGenerationTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/CommentGenerationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/CommentGenerationTest.java index 9e8ddaca4a..f40a4fabaf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/CommentGenerationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/CommentGenerationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.File; import java.nio.file.Files; @@ -34,7 +34,7 @@ public class CommentGenerationTest { @Test public void testSchemaUpdateScriptGeneration() throws Exception { - final String resource = "org/hibernate/test/schemaupdate/CommentGeneration.hbm.xml"; + final String resource = "org/hibernate/orm/test/schemaupdate/CommentGeneration.hbm.xml"; StandardServiceRegistry ssr = new StandardServiceRegistryBuilder() .applySetting( Environment.HBM2DDL_AUTO, "none" ) .applySetting( Environment.DIALECT, SupportCommentDialect.class.getName() ) diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/ConnectionsReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ConnectionsReleaseTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/ConnectionsReleaseTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ConnectionsReleaseTest.java index c524f941a9..1b2286829b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/ConnectionsReleaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ConnectionsReleaseTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.sql.Connection; import java.sql.SQLException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/ExportIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ExportIdentifierTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/ExportIdentifierTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ExportIdentifierTest.java index 0b924a36ad..54d77a7865 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/ExportIdentifierTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ExportIdentifierTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.util.ArrayList; import java.util.Collections; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Group.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/Group.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Group.java index b9dcc51d41..22de192c07 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/Group.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Group.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.Serializable; import java.util.HashSet; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/H2DialectDataBaseToUpperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/H2DialectDataBaseToUpperTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/H2DialectDataBaseToUpperTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/H2DialectDataBaseToUpperTest.java index 30b64b6d53..b0741a9ce3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/H2DialectDataBaseToUpperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/H2DialectDataBaseToUpperTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.util.EnumSet; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java index b142e49d31..d243c58777 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/HANASchemaMigrationTargetScriptCreationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/Hbm2ddlCreateOnlyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/Hbm2ddlCreateOnlyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java index ee8b3a6653..0e89657467 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/Hbm2ddlCreateOnlyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Hbm2ddlCreateOnlyTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import static org.junit.Assert.assertFalse; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/IdentifierHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/IdentifierHelperTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/IdentifierHelperTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/IdentifierHelperTest.java index d4d80a363c..75fb089f6f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/IdentifierHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/IdentifierHelperTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.util.Collections; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/ImplicitCompositeKeyJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ImplicitCompositeKeyJoinTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/ImplicitCompositeKeyJoinTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ImplicitCompositeKeyJoinTest.java index 4f59647beb..380455f172 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/ImplicitCompositeKeyJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ImplicitCompositeKeyJoinTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.Serializable; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MigrationTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MigrationTest.java index 4f0910acc2..88fa97c226 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MigrationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.util.EnumSet; import javax.persistence.Entity; @@ -18,7 +18,6 @@ import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.service.ServiceRegistry; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaUpdate; -import org.hibernate.tool.hbm2ddl.TargetTypeHelper; import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.TestForIssue; @@ -49,8 +48,8 @@ public class MigrationTest extends BaseUnitTestCase { @Test public void testSimpleColumnAddition() { - String resource1 = "org/hibernate/test/schemaupdate/1_Version.hbm.xml"; - String resource2 = "org/hibernate/test/schemaupdate/2_Version.hbm.xml"; + String resource1 = "org/hibernate/orm/test/schemaupdate/1_Version.hbm.xml"; + String resource2 = "org/hibernate/orm/test/schemaupdate/2_Version.hbm.xml"; MetadataImplementor v1metadata = (MetadataImplementor) new MetadataSources( serviceRegistry ) .addResource( resource1 ) diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/MixedFieldPropertyAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MixedFieldPropertyAnnotationTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/MixedFieldPropertyAnnotationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MixedFieldPropertyAnnotationTest.java index 3bc77ea561..9e19c4889a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/MixedFieldPropertyAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MixedFieldPropertyAnnotationTest.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.util.EnumSet; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java index fffd46889d..5edb061343 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.File; import java.io.IOException; @@ -39,7 +39,7 @@ import org.hibernate.tool.schema.TargetType; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.util.DdlTransactionIsolatorTestingImpl; +import org.hibernate.orm.test.util.DdlTransactionIsolatorTestingImpl; import org.junit.Before; import org.junit.Test; @@ -156,7 +156,7 @@ public class PostgreSQLMultipleSchemaSequenceTest extends BaseUnitTestCase { assertEquals( 2 , sqlLines .stream() - .filter( s -> s.equalsIgnoreCase( "create sequence SEQ_TEST start 1 increment 1" ) ) + .filter( s -> s.equalsIgnoreCase( "create sequence SEQ_TEST start with 1 increment by 1" ) ) .count() ); } diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/QuotedTableNameSchemaUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameSchemaUpdateTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/QuotedTableNameSchemaUpdateTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameSchemaUpdateTest.java index 7ce080290e..b39dbdb2cf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/QuotedTableNameSchemaUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameSchemaUpdateTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.File; import java.io.IOException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/QuotedTableNameWithForeignKeysSchemaUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameWithForeignKeysSchemaUpdateTest.java similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/QuotedTableNameWithForeignKeysSchemaUpdateTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameWithForeignKeysSchemaUpdateTest.java index ed81a9f02e..63aa44e4ac 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/QuotedTableNameWithForeignKeysSchemaUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/QuotedTableNameWithForeignKeysSchemaUpdateTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.util.EnumSet; @@ -33,7 +33,7 @@ public class QuotedTableNameWithForeignKeysSchemaUpdateTest extends BaseUnitTest StandardServiceRegistry ssr = new StandardServiceRegistryBuilder().build(); try { final MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr ) - .addResource( "org/hibernate/test/schemaupdate/UserGroup.hbm.xml" ) + .addResource( "org/hibernate/orm/test/schemaupdate/UserGroup.hbm.xml" ) .buildMetadata(); metadata.validate(); new SchemaUpdate().execute( EnumSet.of( TargetType.DATABASE ), metadata ); @@ -48,7 +48,7 @@ public class QuotedTableNameWithForeignKeysSchemaUpdateTest extends BaseUnitTest StandardServiceRegistry ssr = new StandardServiceRegistryBuilder().build(); try { final MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr ) - .addResource( "org/hibernate/test/schemaupdate/UserGroup.hbm.xml" ) + .addResource( "org/hibernate/orm/test/schemaupdate/UserGroup.hbm.xml" ) .buildMetadata(); new SchemaUpdate().execute( EnumSet.of( TargetType.DATABASE ), metadata ); } @@ -63,7 +63,7 @@ public class QuotedTableNameWithForeignKeysSchemaUpdateTest extends BaseUnitTest try { final MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr ) - .addResource( "org/hibernate/test/schemaupdate/UserGroup.hbm.xml" ) + .addResource( "org/hibernate/orm/test/schemaupdate/UserGroup.hbm.xml" ) .buildMetadata(); new SchemaUpdate().execute( EnumSet.of( TargetType.STDOUT ), metadata ); } @@ -78,7 +78,7 @@ public class QuotedTableNameWithForeignKeysSchemaUpdateTest extends BaseUnitTest try { final MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr ) - .addResource( "org/hibernate/test/schemaupdate/UserGroup.hbm.xml" ) + .addResource( "org/hibernate/orm/test/schemaupdate/UserGroup.hbm.xml" ) .buildMetadata(); new SchemaExport().drop( EnumSet.of( TargetType.STDOUT, TargetType.DATABASE ), metadata ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaDropTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaDropTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropTest.java index b8abe418c7..7f59001e4f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaDropTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaDropTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportTest.java index 8f537d62ee..d6ba54c177 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.File; import java.nio.file.Files; @@ -39,8 +39,8 @@ import static org.junit.Assert.assertTrue; */ public class SchemaExportTest extends BaseUnitTestCase { private boolean doesDialectSupportDropTableIfExist() { - return Dialect.getDialect().supportsIfExistsAfterTableName() || Dialect.getDialect() - .supportsIfExistsBeforeTableName(); + final Dialect dialect = metadata.getDatabase().getDialect(); + return dialect.supportsIfExistsAfterTableName() || dialect.supportsIfExistsBeforeTableName(); } protected ServiceRegistry serviceRegistry; @@ -50,7 +50,7 @@ public class SchemaExportTest extends BaseUnitTestCase { public void setUp() { serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); metadata = (MetadataImplementor) new MetadataSources( serviceRegistry ) - .addResource( "org/hibernate/test/schemaupdate/mapping.hbm.xml" ) + .addResource( "org/hibernate/orm/test/schemaupdate/mapping.hbm.xml" ) .buildMetadata(); metadata.validate(); @@ -152,7 +152,7 @@ public class SchemaExportTest extends BaseUnitTestCase { output.deleteOnExit(); final MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( serviceRegistry ) - .addResource( "org/hibernate/test/schemaupdate/mapping2.hbm.xml" ) + .addResource( "org/hibernate/orm/test/schemaupdate/mapping2.hbm.xml" ) .buildMetadata(); metadata.validate(); diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportWithGlobalQuotingEnabledTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithGlobalQuotingEnabledTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportWithGlobalQuotingEnabledTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithGlobalQuotingEnabledTest.java index ebc6fd74d5..32cf80075e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportWithGlobalQuotingEnabledTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithGlobalQuotingEnabledTest.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.sql.SQLException; import java.util.EnumSet; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportWithIndexAndDefaultSchema.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithIndexAndDefaultSchema.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportWithIndexAndDefaultSchema.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithIndexAndDefaultSchema.java index ff8ccf9403..9be4490ef8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportWithIndexAndDefaultSchema.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportWithIndexAndDefaultSchema.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.util.EnumSet; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java index c61182ad96..ae16abdd0d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigrationTargetScriptCreationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java index 2e4acd9792..9efdcc7580 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateDelimiterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateDelimiterTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateDelimiterTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateDelimiterTest.java index 9dfb2a684a..dbe986db3e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateDelimiterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateDelimiterTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.File; import java.nio.charset.Charset; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateFormatterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateFormatterTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateFormatterTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateFormatterTest.java index e8a3bd3ff5..8cd8d9f390 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateFormatterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateFormatterTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.File; import java.nio.file.Files; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateGeneratingOnlyScriptFileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateGeneratingOnlyScriptFileTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateGeneratingOnlyScriptFileTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateGeneratingOnlyScriptFileTest.java index 3cd1ce4f36..2c3e75ceae 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateGeneratingOnlyScriptFileTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateGeneratingOnlyScriptFileTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.File; import java.nio.file.Files; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateHaltOnErrorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateHaltOnErrorTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateHaltOnErrorTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateHaltOnErrorTest.java index dc8a7124d4..37032fed2b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateHaltOnErrorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateHaltOnErrorTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTableTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTableTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTableTest.java index fa4b0af2e1..ea6a09f375 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTableTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.File; import java.nio.file.Files; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTablesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTablesTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTablesTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTablesTest.java index f1e426c5d2..984f615fe9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTablesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintSecondaryTablesTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.File; import java.nio.file.Files; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintTest.java index 1cc8f0be3f..5fd03cc1ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateJoinColumnNoConstraintTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.File; import java.nio.file.Files; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateProceedOnErrorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateProceedOnErrorTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateProceedOnErrorTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateProceedOnErrorTest.java index bf53f3ff4b..6f496df659 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateProceedOnErrorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateProceedOnErrorTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.util.Map; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateSQLServerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSQLServerTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateSQLServerTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSQLServerTest.java index 3f3c002bf7..cf5a630296 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateSQLServerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSQLServerTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.File; import java.io.IOException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateSchemaNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSchemaNameTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateSchemaNameTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSchemaNameTest.java index 92971c38e9..865aeb661b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateSchemaNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSchemaNameTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateTableBackedSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTableBackedSequenceTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateTableBackedSequenceTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTableBackedSequenceTest.java index 96c20f4350..ec26d3faaa 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateTableBackedSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTableBackedSequenceTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.sql.SQLException; import java.util.Collections; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTest.java index 8d3c544767..7eb7db9f87 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.File; import java.io.IOException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java index 5c229754a4..1e53651138 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.util.EnumSet; import javax.persistence.Basic; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateWithViewsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithViewsTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateWithViewsTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithViewsTest.java index a3cde384a3..f9f7cc5ebd 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaUpdateWithViewsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithViewsTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.IOException; import java.util.EnumSet; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SequenceReadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SequenceReadingTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SequenceReadingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SequenceReadingTest.java index e616d3a0f5..73e5ed21ec 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SequenceReadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SequenceReadingTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.util.EnumSet; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SqlServerQuoteSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SqlServerQuoteSchemaTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SqlServerQuoteSchemaTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SqlServerQuoteSchemaTest.java index af70650e95..33eaa278b2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SqlServerQuoteSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SqlServerQuoteSchemaTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.File; import java.io.IOException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/TableCommentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TableCommentTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/TableCommentTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TableCommentTest.java index 5726267e09..7d430544c9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/TableCommentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TableCommentTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.File; import java.io.IOException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/TestFkUpdating.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TestFkUpdating.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/TestFkUpdating.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TestFkUpdating.java index d9ed970f13..82a35eac2b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/TestFkUpdating.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/TestFkUpdating.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.util.EnumSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/User.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/User.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/User.java index 0dda1392a1..90e0110800 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/User.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; import java.io.Serializable; import java.util.HashSet; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/UserGroup.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/UserGroup.hbm.xml similarity index 79% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/UserGroup.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/UserGroup.hbm.xml index 5971c8dadf..58f1f48565 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/UserGroup.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/UserGroup.hbm.xml @@ -10,9 +10,9 @@ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + package="org.hibernate.orm.test.schemaupdate"> - + @@ -22,14 +22,14 @@ - + org - + @@ -40,7 +40,7 @@ - + org diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/Version.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Version.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/Version.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Version.java index ea1c7cd40c..43854106f7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/Version.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/Version.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate; +package org.hibernate.orm.test.schemaupdate; public class Version { diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/derivedid/ColumnLengthTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/derivedid/ColumnLengthTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/derivedid/ColumnLengthTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/derivedid/ColumnLengthTest.java index 6212122e5a..9e558e8113 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/derivedid/ColumnLengthTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/derivedid/ColumnLengthTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.derivedid; +package org.hibernate.orm.test.schemaupdate.derivedid; import java.io.File; import java.io.Serializable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Employee.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/Employee.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Employee.java index e175963d93..bf982e933b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Employee.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.foreignkeys; +package org.hibernate.orm.test.schemaupdate.foreignkeys; import javax.persistence.Entity; import javax.persistence.ForeignKey; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/ForeignKeyDropTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyDropTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/ForeignKeyDropTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyDropTest.java index 237432ad77..35f7629ccf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/ForeignKeyDropTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyDropTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.foreignkeys; +package org.hibernate.orm.test.schemaupdate.foreignkeys; import java.io.File; import java.io.IOException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/ForeignKeyGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyGenerationTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/ForeignKeyGenerationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyGenerationTest.java index c4a5cedd1c..cbf00fba92 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/ForeignKeyGenerationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyGenerationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.foreignkeys; +package org.hibernate.orm.test.schemaupdate.foreignkeys; import java.io.File; import java.io.IOException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/ForeignKeyMigrationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyMigrationTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/ForeignKeyMigrationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyMigrationTest.java index 0418004626..58e47bbcbc 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/ForeignKeyMigrationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/ForeignKeyMigrationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.foreignkeys; +package org.hibernate.orm.test.schemaupdate.foreignkeys; import java.util.EnumSet; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Group.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/Group.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Group.java index 1f92976415..ad75f12d98 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/Group.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Group.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.foreignkeys; +package org.hibernate.orm.test.schemaupdate.foreignkeys; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/JoinedInheritanceForeignKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/JoinedInheritanceForeignKeyTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/JoinedInheritanceForeignKeyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/JoinedInheritanceForeignKeyTest.java index a2713fbcfb..cafabf2f98 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/JoinedInheritanceForeignKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/JoinedInheritanceForeignKeyTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.foreignkeys; +package org.hibernate.orm.test.schemaupdate.foreignkeys; import javax.persistence.DiscriminatorColumn; import javax.persistence.DiscriminatorType; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Person.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/Person.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Person.java index bf669603dd..b359ce4aad 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Person.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.foreignkeys; +package org.hibernate.orm.test.schemaupdate.foreignkeys; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/Phone.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Phone.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/Phone.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Phone.java index 71f1ba89c8..8251f49542 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/Phone.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Phone.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.foreignkeys; +package org.hibernate.orm.test.schemaupdate.foreignkeys; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/Project.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Project.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/Project.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Project.java index 53abe370c3..0f57544e88 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/Project.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/Project.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.foreignkeys; +package org.hibernate.orm.test.schemaupdate.foreignkeys; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/SchemaUpdateWithKeywordAutoQuotingEnabledTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/SchemaUpdateWithKeywordAutoQuotingEnabledTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/SchemaUpdateWithKeywordAutoQuotingEnabledTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/SchemaUpdateWithKeywordAutoQuotingEnabledTest.java index b1e903ab95..fd7a6f3d37 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/SchemaUpdateWithKeywordAutoQuotingEnabledTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/SchemaUpdateWithKeywordAutoQuotingEnabledTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.foreignkeys; +package org.hibernate.orm.test.schemaupdate.foreignkeys; import java.util.EnumSet; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/User.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/User.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/User.java index 6655dd0375..63812348a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/User.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.foreignkeys; +package org.hibernate.orm.test.schemaupdate.foreignkeys; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/UserSetting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/UserSetting.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/UserSetting.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/UserSetting.java index 3d81793c4c..f9b9ffe70e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/UserSetting.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/UserSetting.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.foreignkeys; +package org.hibernate.orm.test.schemaupdate.foreignkeys; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/crossschema/CrossSchemaForeignKeyGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/CrossSchemaForeignKeyGenerationTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/crossschema/CrossSchemaForeignKeyGenerationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/CrossSchemaForeignKeyGenerationTest.java index 2d6fae465d..f1e792e272 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/crossschema/CrossSchemaForeignKeyGenerationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/CrossSchemaForeignKeyGenerationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.foreignkeys.crossschema; +package org.hibernate.orm.test.schemaupdate.foreignkeys.crossschema; import java.io.File; import java.io.IOException; @@ -49,7 +49,7 @@ import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.tool.schema.TargetDatabaseImpl; +import org.hibernate.orm.test.tool.schema.TargetDatabaseImpl; import org.junit.After; import org.junit.Before; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/crossschema/SchemaOneEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaOneEntity.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/crossschema/SchemaOneEntity.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaOneEntity.java index dea35d83b5..65335ed97c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/crossschema/SchemaOneEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaOneEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.foreignkeys.crossschema; +package org.hibernate.orm.test.schemaupdate.foreignkeys.crossschema; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/crossschema/SchemaTwoEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaTwoEntity.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/crossschema/SchemaTwoEntity.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaTwoEntity.java index 45d64b1e1c..6eb65a01b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/crossschema/SchemaTwoEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/SchemaTwoEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.foreignkeys.crossschema; +package org.hibernate.orm.test.schemaupdate.foreignkeys.crossschema; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/definition/AbstractForeignKeyDefinitionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/AbstractForeignKeyDefinitionTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/definition/AbstractForeignKeyDefinitionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/AbstractForeignKeyDefinitionTest.java index cc6f8c87ee..c6cd33e2f2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/definition/AbstractForeignKeyDefinitionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/AbstractForeignKeyDefinitionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.foreignkeys.definition; +package org.hibernate.orm.test.schemaupdate.foreignkeys.definition; import java.io.File; import java.io.IOException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionManyToOneTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionManyToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionManyToOneTest.java index f331424e27..67f909faa2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionManyToOneTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.foreignkeys.definition; +package org.hibernate.orm.test.schemaupdate.foreignkeys.definition; import javax.persistence.Entity; import javax.persistence.ForeignKey; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToManyJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToManyJoinTableTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToManyJoinTableTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToManyJoinTableTest.java index 0a8255eb0d..9b0f7eacd8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToManyJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToManyJoinTableTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.foreignkeys.definition; +package org.hibernate.orm.test.schemaupdate.foreignkeys.definition; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToOneTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToOneTest.java index 6d44816437..24a1d2d773 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionOneToOneTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.foreignkeys.definition; +package org.hibernate.orm.test.schemaupdate.foreignkeys.definition; import javax.persistence.Entity; import javax.persistence.ForeignKey; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionSecondaryTableTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionSecondaryTableTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionSecondaryTableTest.java index 8096a9f10f..85d7e60bdf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionSecondaryTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionSecondaryTableTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.foreignkeys.definition; +package org.hibernate.orm.test.schemaupdate.foreignkeys.definition; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idbag/IdBagOwner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagOwner.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idbag/IdBagOwner.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagOwner.java index 7463ef4757..4426f90bf0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idbag/IdBagOwner.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagOwner.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.idbag; +package org.hibernate.orm.test.schemaupdate.idbag; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idbag/IdBagSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagSequenceTest.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idbag/IdBagSequenceTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagSequenceTest.java index c6f8562502..96278d52af 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idbag/IdBagSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagSequenceTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.idbag; +package org.hibernate.orm.test.schemaupdate.idbag; import java.io.File; import java.nio.file.Files; @@ -44,7 +44,7 @@ public class IdBagSequenceTest extends BaseUnitTestCase { output.deleteOnExit(); final MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr ) - .addResource( "org/hibernate/test/schemaupdate/idbag/Mappings.hbm.xml" ) + .addResource( "org/hibernate/orm/test/schemaupdate/idbag/Mappings.hbm.xml" ) .buildMetadata(); metadata.validate(); diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idbag/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/Mappings.hbm.xml similarity index 84% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idbag/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/Mappings.hbm.xml index b8a587ef15..c512dd2104 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idbag/Mappings.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/Mappings.hbm.xml @@ -9,9 +9,9 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + - + seq_owner_id @@ -25,7 +25,7 @@ - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idgenerator/SequenceGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGenerationTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idgenerator/SequenceGenerationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGenerationTest.java index 0cc4b94641..bee3894026 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idgenerator/SequenceGenerationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGenerationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.idgenerator; +package org.hibernate.orm.test.schemaupdate.idgenerator; import java.io.File; import java.nio.file.Files; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idgenerator/SequenceGeneratorsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGeneratorsTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idgenerator/SequenceGeneratorsTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGeneratorsTest.java index 236e7ff984..0362f502b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idgenerator/SequenceGeneratorsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGeneratorsTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.idgenerator; +package org.hibernate.orm.test.schemaupdate.idgenerator; import java.io.File; import java.nio.file.Files; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idgenerator/TableGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idgenerator/TableGeneratorTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorTest.java index 1cd2ca335e..ff49743510 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idgenerator/TableGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.idgenerator; +package org.hibernate.orm.test.schemaupdate.idgenerator; import java.io.File; import java.nio.file.Files; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idgenerator/TableGeneratorsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorsTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idgenerator/TableGeneratorsTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorsTest.java index 8195b899e6..bb0ebb6a25 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idgenerator/TableGeneratorsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/TableGeneratorsTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.idgenerator; +package org.hibernate.orm.test.schemaupdate.idgenerator; import java.io.File; import java.nio.file.Files; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/index/ComponentIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/ComponentIndexTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/index/ComponentIndexTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/ComponentIndexTest.java index 7964f7cdee..c58d780927 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/index/ComponentIndexTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/ComponentIndexTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.index; +package org.hibernate.orm.test.schemaupdate.index; import java.util.List; import javax.persistence.Embeddable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/index/IndexesCreationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/IndexesCreationTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/index/IndexesCreationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/IndexesCreationTest.java index 0cfd3d2b63..80619d6bc8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/index/IndexesCreationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/index/IndexesCreationTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.schemaupdate.index; +package org.hibernate.orm.test.schemaupdate.index; import java.util.List; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/CreditCardPayment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/CreditCardPayment.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/CreditCardPayment.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/CreditCardPayment.java index e0e36a772d..484dca8fe5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/CreditCardPayment.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/CreditCardPayment.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.inheritance; +package org.hibernate.orm.test.schemaupdate.inheritance; /** * @author Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Employee.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Employee.hbm.xml similarity index 67% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Employee.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Employee.hbm.xml index 1673979a9e..7e0f10a87e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Employee.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Employee.hbm.xml @@ -8,8 +8,8 @@ - - + + diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Employee.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Employee.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Employee.java index 3605331364..41f1668d48 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Employee.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.inheritance; +package org.hibernate.orm.test.schemaupdate.inheritance; import java.io.Serializable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/ForeignKeyNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/ForeignKeyNameTest.java similarity index 85% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/ForeignKeyNameTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/ForeignKeyNameTest.java index 075320011d..df3afed4eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/ForeignKeyNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/ForeignKeyNameTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.inheritance; +package org.hibernate.orm.test.schemaupdate.inheritance; import java.io.File; import java.nio.file.Files; @@ -41,10 +41,10 @@ public class ForeignKeyNameTest extends BaseUnitTestCase { output.deleteOnExit(); final MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr ) - .addResource( "org/hibernate/test/schemaupdate/inheritance/Employee.hbm.xml" ) - .addResource( "org/hibernate/test/schemaupdate/inheritance/Person.hbm.xml" ) - .addResource( "org/hibernate/test/schemaupdate/inheritance/Manager.hbm.xml" ) - .addResource( "org/hibernate/test/schemaupdate/inheritance/Payment.hbm.xml" ) + .addResource( "org/hibernate/orm/test/schemaupdate/inheritance/Employee.hbm.xml" ) + .addResource( "org/hibernate/orm/test/schemaupdate/inheritance/Person.hbm.xml" ) + .addResource( "org/hibernate/orm/test/schemaupdate/inheritance/Manager.hbm.xml" ) + .addResource( "org/hibernate/orm/test/schemaupdate/inheritance/Payment.hbm.xml" ) .buildMetadata(); metadata.validate(); @@ -73,7 +73,7 @@ public class ForeignKeyNameTest extends BaseUnitTestCase { output.deleteOnExit(); final MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr ) - .addResource( "org/hibernate/test/schemaupdate/inheritance/Payment.hbm.xml" ) + .addResource( "org/hibernate/orm/test/schemaupdate/inheritance/Payment.hbm.xml" ) .buildMetadata(); metadata.validate(); diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Manager.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Manager.hbm.xml similarity index 66% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Manager.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Manager.hbm.xml index bd25532217..386a8056af 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Manager.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Manager.hbm.xml @@ -8,8 +8,8 @@ - - + + diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Manager.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Manager.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Manager.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Manager.java index 77dffc856f..29b8f68898 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Manager.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Manager.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.inheritance; +package org.hibernate.orm.test.schemaupdate.inheritance; import java.io.Serializable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Payment.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Payment.hbm.xml similarity index 75% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Payment.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Payment.hbm.xml index 1170faf12e..275fa6608d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Payment.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Payment.hbm.xml @@ -8,14 +8,14 @@ - - + + - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Payment.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Payment.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Payment.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Payment.java index 0e777a638d..78021bc381 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Payment.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Payment.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.inheritance; +package org.hibernate.orm.test.schemaupdate.inheritance; /** * @author Andrea Boriero diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Person.hbm.xml similarity index 79% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Person.hbm.xml index 0c97420239..f08bdae5dc 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Person.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Person.hbm.xml @@ -8,8 +8,8 @@ - - + + diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Person.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Person.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Person.java index 1082c8bde8..f18dcdbab5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/Person.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.inheritance; +package org.hibernate.orm.test.schemaupdate.inheritance; import java.io.Serializable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/hhh_x/GroupStep.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/GroupStep.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/hhh_x/GroupStep.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/GroupStep.java index e5c92d99ba..7f198ecd61 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/hhh_x/GroupStep.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/GroupStep.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.inheritance.hhh_x; +package org.hibernate.orm.test.schemaupdate.inheritance.hhh_x; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/hhh_x/InheritanceSchemaUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/InheritanceSchemaUpdateTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/hhh_x/InheritanceSchemaUpdateTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/InheritanceSchemaUpdateTest.java index c4852f6944..9e3577e064 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/hhh_x/InheritanceSchemaUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/InheritanceSchemaUpdateTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.inheritance.hhh_x; +package org.hibernate.orm.test.schemaupdate.inheritance.hhh_x; import java.util.EnumSet; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/hhh_x/Step.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/Step.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/hhh_x/Step.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/Step.java index e01d1062de..5b5575dda3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/hhh_x/Step.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/hhh_x/Step.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.inheritance.hhh_x; +package org.hibernate.orm.test.schemaupdate.inheritance.hhh_x; import javax.persistence.Column; import javax.persistence.DiscriminatorColumn; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/tableperclass/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Category.java similarity index 85% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/tableperclass/Category.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Category.java index c61fb98749..c5c6b5c182 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/tableperclass/Category.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Category.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.inheritance.tableperclass; +package org.hibernate.orm.test.schemaupdate.inheritance.tableperclass; import javax.persistence.Entity; import javax.persistence.Table; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/tableperclass/Element.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Element.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/tableperclass/Element.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Element.java index f32510efe7..68be07f7c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/tableperclass/Element.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/Element.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.inheritance.tableperclass; +package org.hibernate.orm.test.schemaupdate.inheritance.tableperclass; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/tableperclass/SchemaCreationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/SchemaCreationTest.java similarity index 78% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/tableperclass/SchemaCreationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/SchemaCreationTest.java index 76e0523a78..8c78dcbc36 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/inheritance/tableperclass/SchemaCreationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/SchemaCreationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.inheritance.tableperclass; +package org.hibernate.orm.test.schemaupdate.inheritance.tableperclass; import java.io.File; import java.io.IOException; @@ -21,6 +21,7 @@ import org.hibernate.dialect.CockroachDialect; import org.hibernate.dialect.DB2Dialect; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.PostgreSQL81Dialect; +import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; @@ -82,23 +83,17 @@ public class SchemaCreationTest { .matches( dialect.getAlterTableString( "element" ) ), is( false ) ); - if ( dialect instanceof DB2Dialect) { - if (statement.toLowerCase().startsWith("create unique index") - && statement.toLowerCase().contains("category (code)")) { - isUniqueConstraintCreated = true; - } + if (statement.toLowerCase().startsWith("create unique index") + && statement.toLowerCase().contains("category (code)")) { + isUniqueConstraintCreated = true; } - else if ( dialect instanceof PostgreSQL81Dialect || dialect instanceof CockroachDialect ) { - if (statement.toLowerCase().startsWith("alter table if exists category add constraint") - && statement.toLowerCase().contains("unique (code)")) { - isUniqueConstraintCreated = true; - } + else if (statement.toLowerCase().startsWith("alter table if exists category add constraint") + && statement.toLowerCase().contains("unique (code)")) { + isUniqueConstraintCreated = true; } - else { - if (statement.toLowerCase().startsWith("alter table category add constraint") - && statement.toLowerCase().contains("unique (code)")) { - isUniqueConstraintCreated = true; - } + else if (statement.toLowerCase().startsWith("alter table category add constraint") + && statement.toLowerCase().contains("unique (code)")) { + isUniqueConstraintCreated = true; } } diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/manytomany/ForeignKeyNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/ForeignKeyNameTest.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/manytomany/ForeignKeyNameTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/ForeignKeyNameTest.java index 06ead60487..1544dcb6ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/manytomany/ForeignKeyNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/ForeignKeyNameTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.manytomany; +package org.hibernate.orm.test.schemaupdate.manytomany; import java.io.File; import java.nio.file.Files; @@ -41,7 +41,7 @@ public class ForeignKeyNameTest extends BaseUnitTestCase { output.deleteOnExit(); final MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr ) - .addResource( "org/hibernate/test/schemaupdate/manytomany/UserGroup.hbm.xml" ) + .addResource( "org/hibernate/orm/test/schemaupdate/manytomany/UserGroup.hbm.xml" ) .buildMetadata(); metadata.validate(); diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/manytomany/Group.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/Group.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/manytomany/Group.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/Group.java index 07a54b90df..3c8648b704 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/manytomany/Group.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/Group.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.manytomany; +package org.hibernate.orm.test.schemaupdate.manytomany; import java.io.Serializable; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/manytomany/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/User.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/manytomany/User.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/User.java index 85392ff522..03da98df9d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/manytomany/User.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/User.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.manytomany; +package org.hibernate.orm.test.schemaupdate.manytomany; import java.io.Serializable; import java.util.HashSet; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/manytomany/UserGroup.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/UserGroup.hbm.xml similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/manytomany/UserGroup.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/UserGroup.hbm.xml index 8e23d54b11..695ab36ed9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/manytomany/UserGroup.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/manytomany/UserGroup.hbm.xml @@ -10,7 +10,7 @@ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + package="org.hibernate.orm.test.schemaupdate.manytomany"> diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/mapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/mapping.hbm.xml similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/mapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/mapping.hbm.xml index 2bb6fd89ef..b61d82b001 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/mapping.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/mapping.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/mapping2.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/mapping2.hbm.xml similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/mapping2.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/mapping2.hbm.xml index 863a2b3f1e..3335f66e63 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/mapping2.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/mapping2.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/uniqueconstraint/TestEntity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/TestEntity.hbm.xml similarity index 88% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/uniqueconstraint/TestEntity.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/TestEntity.hbm.xml index fd3abfe8f0..e221224f57 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/uniqueconstraint/TestEntity.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/TestEntity.hbm.xml @@ -1,7 +1,7 @@ - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/uniqueconstraint/TestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/TestEntity.java similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/uniqueconstraint/TestEntity.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/TestEntity.java index c38e90381c..ad8882ed37 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/uniqueconstraint/TestEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/TestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.uniqueconstraint; +package org.hibernate.orm.test.schemaupdate.uniqueconstraint; import java.util.List; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java index 510dcd6158..6b4e0254bc 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.uniqueconstraint; +package org.hibernate.orm.test.schemaupdate.uniqueconstraint; import java.io.File; import java.io.IOException; @@ -67,7 +67,7 @@ public class UniqueConstraintDropTest { .applySetting( Environment.SHOW_SQL, "true" ) .build(); metadata = (MetadataImplementor) new MetadataSources( ssr ) - .addResource( "org/hibernate/test/schemaupdate/uniqueconstraint/TestEntity.hbm.xml" ) + .addResource( "org/hibernate/orm/test/schemaupdate/uniqueconstraint/TestEntity.hbm.xml" ) .buildMetadata(); metadata.validate(); tool = (HibernateSchemaManagementTool) ssr.getService( SchemaManagementTool.class ); @@ -153,7 +153,16 @@ public class UniqueConstraintDropTest { private boolean checkDropIndex(String tableName, String columnName) throws IOException { boolean matches = false; - String regex = "alter table " + tableName + " drop index"; + String regex = "alter table "; + + if ( getDialect().supportsIfExistsBeforeTableName() ) { + regex += "if exists "; + } + regex += tableName; + if ( getDialect().supportsIfExistsAfterTableName() ) { + regex += " if exists"; + } + regex += " drop index"; if ( getDialect().supportsIfExistsBeforeConstraintName() ) { regex += " if exists"; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/uniqueconstraint/UniqueConstraintGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintGenerationTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/uniqueconstraint/UniqueConstraintGenerationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintGenerationTest.java index bfecfad11e..cfcfd82a03 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/uniqueconstraint/UniqueConstraintGenerationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintGenerationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemaupdate.uniqueconstraint; +package org.hibernate.orm.test.schemaupdate.uniqueconstraint; import java.io.File; import java.io.IOException; @@ -48,7 +48,7 @@ public class UniqueConstraintGenerationTest { .applySetting( Environment.HBM2DDL_AUTO, "none" ) .build(); metadata = (MetadataImplementor) new MetadataSources( ssr ) - .addResource( "org/hibernate/test/schemaupdate/uniqueconstraint/TestEntity.hbm.xml" ) + .addResource( "org/hibernate/orm/test/schemaupdate/uniqueconstraint/TestEntity.hbm.xml" ) .buildMetadata(); metadata.validate(); } diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemavalidation/JoinTableWithDefaultSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/JoinTableWithDefaultSchemaTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemavalidation/JoinTableWithDefaultSchemaTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/JoinTableWithDefaultSchemaTest.java index 647fb3c920..c10b6bdd3a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemavalidation/JoinTableWithDefaultSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/JoinTableWithDefaultSchemaTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemavalidation; +package org.hibernate.orm.test.schemavalidation; import java.util.ArrayList; import java.util.EnumSet; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemavalidation/LongVarcharValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/LongVarcharValidationTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/schemavalidation/LongVarcharValidationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/LongVarcharValidationTest.java index 0adab4ef24..58e245fbf8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemavalidation/LongVarcharValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/LongVarcharValidationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemavalidation; +package org.hibernate.orm.test.schemavalidation; import java.util.Arrays; import java.util.Collection; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemavalidation/NumericValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemavalidation/NumericValidationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java index a18eaf8efc..3b734244a7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemavalidation/NumericValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemavalidation; +package org.hibernate.orm.test.schemavalidation; import java.math.BigDecimal; import java.util.Arrays; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemavalidation/SynonymValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/SynonymValidationTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/schemavalidation/SynonymValidationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/SynonymValidationTest.java index a4ce9b55f0..d260918090 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemavalidation/SynonymValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/SynonymValidationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemavalidation; +package org.hibernate.orm.test.schemavalidation; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemavalidation/ViewValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ViewValidationTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/schemavalidation/ViewValidationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ViewValidationTest.java index 890277c0e1..d677197ce7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemavalidation/ViewValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ViewValidationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemavalidation; +package org.hibernate.orm.test.schemavalidation; import javax.persistence.Column; import javax.persistence.Entity; @@ -108,7 +108,6 @@ public class ViewValidationTest extends BaseCoreFunctionalTestCase { @Table(name = "test_entity") private static class TestEntity { @Id - @GeneratedValue private Long id; @Column(nullable = false) @@ -145,7 +144,6 @@ public class ViewValidationTest extends BaseCoreFunctionalTestCase { @Table(name = "test_synonym") private static class TestEntityWithSynonym { @Id - @GeneratedValue private Long id; @Column(nullable = false) diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemavalidation/matchingtablenames/TableNamesWithUnderscoreTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/matchingtablenames/TableNamesWithUnderscoreTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/schemavalidation/matchingtablenames/TableNamesWithUnderscoreTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/matchingtablenames/TableNamesWithUnderscoreTest.java index ffbb3bbeec..d0c438c470 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/schemavalidation/matchingtablenames/TableNamesWithUnderscoreTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/matchingtablenames/TableNamesWithUnderscoreTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.schemavalidation.matchingtablenames; +package org.hibernate.orm.test.schemavalidation.matchingtablenames; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/serialization/TypedValueSerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/TypedValueSerializationTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/serialization/TypedValueSerializationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/serialization/TypedValueSerializationTest.java index 6067ff2cdf..4a755086e5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/serialization/TypedValueSerializationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/TypedValueSerializationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.serialization; +package org.hibernate.orm.test.serialization; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; diff --git a/hibernate-core/src/test/java/org/hibernate/test/service/ClassLoaderServiceImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/service/ClassLoaderServiceImplTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/service/ClassLoaderServiceImplTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/service/ClassLoaderServiceImplTest.java index 5af31d07aa..a0fd3071ce 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/service/ClassLoaderServiceImplTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/service/ClassLoaderServiceImplTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.service; +package org.hibernate.orm.test.service; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -20,7 +20,6 @@ import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.integrator.spi.Integrator; import org.hibernate.internal.util.ConfigHelper; -import org.hibernate.internal.util.collections.CollectionHelper; import org.hibernate.service.ServiceRegistry; import org.hibernate.testing.TestForIssue; import org.junit.Assert; @@ -110,7 +109,7 @@ public class ClassLoaderServiceImplTest { protected Enumeration findResources(String name) throws IOException { if (name.equals( "META-INF/services/org.hibernate.integrator.spi.Integrator" )) { final URL serviceUrl = ConfigHelper.findAsResource( - "org/hibernate/test/service/org.hibernate.integrator.spi.Integrator" ); + "org/hibernate/orm/test/service/org.hibernate.integrator.spi.Integrator" ); return new Enumeration() { boolean hasMore = true; diff --git a/hibernate-core/src/test/java/org/hibernate/test/service/ServiceBootstrappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/service/ServiceBootstrappingTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/service/ServiceBootstrappingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/service/ServiceBootstrappingTest.java index 32ceb47388..093257ab79 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/service/ServiceBootstrappingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/service/ServiceBootstrappingTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.service; +package org.hibernate.orm.test.service; import java.util.Properties; diff --git a/hibernate-core/src/test/java/org/hibernate/test/service/TestIntegrator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/service/TestIntegrator.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/service/TestIntegrator.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/service/TestIntegrator.java index 6b2fd7ddf9..b9b802823c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/service/TestIntegrator.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/service/TestIntegrator.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.service; +package org.hibernate.orm.test.service; import org.hibernate.boot.Metadata; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/DropSchemaDuringJtaTxnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/DropSchemaDuringJtaTxnTest.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/tool/schema/DropSchemaDuringJtaTxnTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/DropSchemaDuringJtaTxnTest.java index e432310f64..cd529805d5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/DropSchemaDuringJtaTxnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/DropSchemaDuringJtaTxnTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.tool.schema; +package org.hibernate.orm.test.tool.schema; import java.util.HashMap; import java.util.Map; @@ -21,7 +21,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.resource.transaction.jta.JtaPlatformStandardTestingImpl; +import org.hibernate.orm.test.resource.transaction.jta.JtaPlatformStandardTestingImpl; import org.junit.Test; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/ExecutionOptionsTestImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/ExecutionOptionsTestImpl.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/tool/schema/ExecutionOptionsTestImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/ExecutionOptionsTestImpl.java index 5b22c1f4db..6f659b5f20 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/ExecutionOptionsTestImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/ExecutionOptionsTestImpl.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.test.tool.schema; +package org.hibernate.orm.test.tool.schema; import java.util.Collections; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/GroupedSchemaValidatorImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/GroupedSchemaValidatorImplTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/tool/schema/GroupedSchemaValidatorImplTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/GroupedSchemaValidatorImplTest.java index c7778ea8b9..50c7da4551 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/GroupedSchemaValidatorImplTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/GroupedSchemaValidatorImplTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.tool.schema; +package org.hibernate.orm.test.tool.schema; import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java index 5371762e08..6140f63613 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplConnectionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.tool.schema; +package org.hibernate.orm.test.tool.schema; import java.io.FileInputStream; import java.io.IOException; @@ -16,7 +16,6 @@ import java.util.Map; import java.util.Properties; import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.PrimaryKeyJoinColumn; import javax.persistence.Table; import org.hibernate.boot.MetadataSources; @@ -40,7 +39,6 @@ import org.hibernate.tool.schema.spi.ContributableMatcher; import org.hibernate.tool.schema.spi.ExceptionHandler; import org.hibernate.tool.schema.spi.ExecutionOptions; import org.hibernate.tool.schema.spi.SchemaFilter; -import org.hibernate.tool.schema.spi.SchemaManagementException; import org.hibernate.tool.schema.spi.SchemaManagementTool; import org.hibernate.tool.schema.spi.SchemaValidator; @@ -49,9 +47,8 @@ import org.hibernate.testing.TestForIssue; import org.hibernate.testing.boot.JdbcConnectionAccessImpl; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.logger.LoggerInspectionRule; -import org.hibernate.test.util.DdlTransactionIsolatorTestingImpl; +import org.hibernate.orm.test.util.DdlTransactionIsolatorTestingImpl; import org.junit.After; -import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/IndividuallySchemaValidatorImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/tool/schema/IndividuallySchemaValidatorImplTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java index 3cff9fc6f4..c7421a801d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/IndividuallySchemaValidatorImplTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/IndividuallySchemaValidatorImplTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.tool.schema; +package org.hibernate.orm.test.tool.schema; import java.io.FileInputStream; import java.io.IOException; @@ -45,7 +45,7 @@ import org.hibernate.testing.TestForIssue; import org.hibernate.testing.boot.JdbcConnectionAccessImpl; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.logger.LoggerInspectionRule; -import org.hibernate.test.util.DdlTransactionIsolatorTestingImpl; +import org.hibernate.orm.test.util.DdlTransactionIsolatorTestingImpl; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/JtaPlatformLoggingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/JtaPlatformLoggingTest.java similarity index 78% rename from hibernate-core/src/test/java/org/hibernate/test/tool/schema/JtaPlatformLoggingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/JtaPlatformLoggingTest.java index c919fa9e89..f49b1fb1cc 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/JtaPlatformLoggingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/JtaPlatformLoggingTest.java @@ -4,32 +4,22 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.tool.schema; +package org.hibernate.orm.test.tool.schema; -import java.util.HashMap; import java.util.Map; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import org.hibernate.SessionFactory; -import org.hibernate.boot.MetadataSources; -import org.hibernate.boot.model.process.internal.ScanningCoordinator; -import org.hibernate.boot.registry.StandardServiceRegistry; -import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.cfg.Environment; import org.hibernate.engine.transaction.jta.platform.internal.JtaPlatformInitiator; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.logger.LoggerInspectionRule; import org.hibernate.testing.logger.Triggerable; -import org.hibernate.test.resource.transaction.jta.JtaPlatformStandardTestingImpl; -import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/SchemaGenetationSciptsActionPropertyValueEndingWithSpaceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaGenetationSciptsActionPropertyValueEndingWithSpaceTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/tool/schema/SchemaGenetationSciptsActionPropertyValueEndingWithSpaceTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaGenetationSciptsActionPropertyValueEndingWithSpaceTest.java index 70b35aaacb..a277501f67 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/SchemaGenetationSciptsActionPropertyValueEndingWithSpaceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaGenetationSciptsActionPropertyValueEndingWithSpaceTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.test.tool.schema; +package org.hibernate.orm.test.tool.schema; import java.io.File; import java.io.IOException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/SchemaToolTransactionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaToolTransactionHandlingTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/tool/schema/SchemaToolTransactionHandlingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaToolTransactionHandlingTest.java index 74e12e471e..a326d8b6c8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/SchemaToolTransactionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/SchemaToolTransactionHandlingTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.test.tool.schema; +package org.hibernate.orm.test.tool.schema; import java.util.Collections; import java.util.EnumSet; diff --git a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/TargetDatabaseImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/TargetDatabaseImpl.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/tool/schema/TargetDatabaseImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/TargetDatabaseImpl.java index 0f284e1790..efbafd687e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/TargetDatabaseImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/TargetDatabaseImpl.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.tool.schema; +package org.hibernate.orm.test.tool.schema; import java.sql.Connection; import java.sql.SQLException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/TargetStdoutImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/TargetStdoutImpl.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/tool/schema/TargetStdoutImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/TargetStdoutImpl.java index 13a69eb21c..3281736244 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/TargetStdoutImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/TargetStdoutImpl.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.tool.schema; +package org.hibernate.orm.test.tool.schema; import org.hibernate.engine.jdbc.internal.FormatStyle; import org.hibernate.engine.jdbc.internal.Formatter; diff --git a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/internal/CheckForExistingForeignKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/internal/CheckForExistingForeignKeyTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/tool/schema/internal/CheckForExistingForeignKeyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/internal/CheckForExistingForeignKeyTest.java index 437f880979..4a95b75761 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/internal/CheckForExistingForeignKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/internal/CheckForExistingForeignKeyTest.java @@ -1,4 +1,4 @@ -package org.hibernate.test.tool.schema.internal; +package org.hibernate.orm.test.tool.schema.internal; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/scripts/MultiLineImportExtractorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportExtractorTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/tool/schema/scripts/MultiLineImportExtractorTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportExtractorTest.java index e64bd59e43..eeeb5a975c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/scripts/MultiLineImportExtractorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportExtractorTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.tool.schema.scripts; +package org.hibernate.orm.test.tool.schema.scripts; import java.io.IOException; import java.io.InputStream; diff --git a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/scripts/MultiLineImportWithSpacesAfterTheLastStatementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithSpacesAfterTheLastStatementTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/tool/schema/scripts/MultiLineImportWithSpacesAfterTheLastStatementTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithSpacesAfterTheLastStatementTest.java index d6294b03b7..0f220180f8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/scripts/MultiLineImportWithSpacesAfterTheLastStatementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithSpacesAfterTheLastStatementTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.tool.schema.scripts; +package org.hibernate.orm.test.tool.schema.scripts; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/scripts/MultiLineImportWithTabsAndSpacesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithTabsAndSpacesTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/tool/schema/scripts/MultiLineImportWithTabsAndSpacesTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithTabsAndSpacesTest.java index 4fec11793e..8ebf0bef0f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/tool/schema/scripts/MultiLineImportWithTabsAndSpacesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/MultiLineImportWithTabsAndSpacesTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.tool.schema.scripts; +package org.hibernate.orm.test.tool.schema.scripts; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/StatementsWithoutTerminalCharsImportFileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/StatementsWithoutTerminalCharsImportFileTest.java index 875eea51e2..126c61cb10 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/StatementsWithoutTerminalCharsImportFileTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/StatementsWithoutTerminalCharsImportFileTest.java @@ -39,7 +39,7 @@ import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.schemaupdate.CommentGenerationTest; +import org.hibernate.orm.test.schemaupdate.CommentGenerationTest; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/unidir/BackrefPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefPropertyRefTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/unidir/BackrefPropertyRefTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefPropertyRefTest.java index 64042688a4..77b874bcac 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/unidir/BackrefPropertyRefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefPropertyRefTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.unidir; +package org.hibernate.orm.test.unidir; import org.hibernate.testing.FailureExpected; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/unidir/BackrefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefTest.java old mode 100755 new mode 100644 similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/unidir/BackrefTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefTest.java index 6cd56eacb3..ce941d5382 --- a/hibernate-core/src/test/java/org/hibernate/test/unidir/BackrefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.unidir; +package org.hibernate.orm.test.unidir; import org.hibernate.Hibernate; import org.hibernate.Session; @@ -20,6 +20,12 @@ import static org.junit.Assert.assertFalse; * @author Gavin King */ public class BackrefTest extends BaseCoreFunctionalTestCase { + + @Override + protected String getBaseForMappings() { + return "org/hibernate/orm/test/"; + } + @Override protected String[] getMappings() { return new String[] { "unidir/ParentChild.hbm.xml" }; diff --git a/hibernate-core/src/test/java/org/hibernate/test/unidir/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child.java old mode 100755 new mode 100644 similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/unidir/Child.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child.java index 61b91d6be3..b54fe5ea9d --- a/hibernate-core/src/test/java/org/hibernate/test/unidir/Child.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child.java @@ -6,7 +6,7 @@ */ //$Id: Child.java 5686 2005-02-12 07:27:32Z steveebersole $ -package org.hibernate.test.unidir; +package org.hibernate.orm.test.unidir; diff --git a/hibernate-core/src/test/java/org/hibernate/test/unidir/Child1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child1.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/unidir/Child1.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child1.java index 1624edd02d..f711d640a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/unidir/Child1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child1.java @@ -1,35 +1,35 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.test.unidir; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; - -@Entity -@Table(name = "CHILD1") -public class Child1 { - @Id - @Column(name = "ID") - private Long id; - - @OneToMany(fetch = FetchType.LAZY) - @JoinColumn(name = "CHILD1_ID", nullable = false) - private List parents = new ArrayList(); - - public Long getId() { - return this.id; - } - - public List getParents() { - return this.parents; - } - - public void setParents(List parents) { - this.parents = parents; - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.orm.test.unidir; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table(name = "CHILD1") +public class Child1 { + @Id + @Column(name = "ID") + private Long id; + + @OneToMany(fetch = FetchType.LAZY) + @JoinColumn(name = "CHILD1_ID", nullable = false) + private List parents = new ArrayList(); + + public Long getId() { + return this.id; + } + + public List getParents() { + return this.parents; + } + + public void setParents(List parents) { + this.parents = parents; + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/unidir/Child2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child2.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/unidir/Child2.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child2.java index 9b541b0055..fa496e7de9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/unidir/Child2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Child2.java @@ -1,35 +1,35 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.test.unidir; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; - -@Entity -@Table(name = "CHILD2") -public class Child2 { - @Id - @Column(name = "ID") - private Long id; - - @OneToMany(fetch = FetchType.LAZY) - @JoinColumn(name = "CHILD2_ID", nullable = false) - private List parents = new ArrayList(); - - public Long getId() { - return this.id; - } - - public List getParents() { - return this.parents; - } - - public void setParents(List parents) { - this.parents = parents; - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.orm.test.unidir; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table(name = "CHILD2") +public class Child2 { + @Id + @Column(name = "ID") + private Long id; + + @OneToMany(fetch = FetchType.LAZY) + @JoinColumn(name = "CHILD2_ID", nullable = false) + private List parents = new ArrayList(); + + public Long getId() { + return this.id; + } + + public List getParents() { + return this.parents; + } + + public void setParents(List parents) { + this.parents = parents; + } +} diff --git a/hibernate-core/src/test/java/org/hibernate/test/unidir/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Parent.java old mode 100755 new mode 100644 similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/unidir/Parent.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Parent.java index ac22cf00f3..3b1a5626e1 --- a/hibernate-core/src/test/java/org/hibernate/test/unidir/Parent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Parent.java @@ -6,7 +6,7 @@ */ //$Id: Parent.java 5686 2005-02-12 07:27:32Z steveebersole $ -package org.hibernate.test.unidir; +package org.hibernate.orm.test.unidir; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/test/unidir/Parent1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Parent1.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/test/unidir/Parent1.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Parent1.java index 8aa923acf4..9c8c1d062f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/unidir/Parent1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/Parent1.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.unidir; +package org.hibernate.orm.test.unidir; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/unidir/ParentChild.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/ParentChild.hbm.xml old mode 100755 new mode 100644 similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/unidir/ParentChild.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/unidir/ParentChild.hbm.xml index 7f3ba6499f..c0a024bf33 --- a/hibernate-core/src/test/java/org/hibernate/test/unidir/ParentChild.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/ParentChild.hbm.xml @@ -10,7 +10,7 @@ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + package="org.hibernate.orm.test.unidir"> diff --git a/hibernate-core/src/test/java/org/hibernate/test/unidir/ParentChildPropertyRef.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/ParentChildPropertyRef.hbm.xml similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/unidir/ParentChildPropertyRef.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/unidir/ParentChildPropertyRef.hbm.xml index f093af75bc..434d93459a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/unidir/ParentChildPropertyRef.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/ParentChildPropertyRef.hbm.xml @@ -10,7 +10,7 @@ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + package="org.hibernate.orm.test.unidir"> diff --git a/hibernate-core/src/test/java/org/hibernate/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java index b03a986623..c36adecc80 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.unidir; +package org.hibernate.orm.test.unidir; import java.io.Serializable; import java.util.Arrays; diff --git a/hibernate-core/src/test/java/org/hibernate/test/util/BytesHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/BytesHelperTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/util/BytesHelperTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/util/BytesHelperTest.java index 4722edcd8a..9bbb45a0a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/util/BytesHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/BytesHelperTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.util; +package org.hibernate.orm.test.util; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/util/DdlTransactionIsolatorTestingImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/DdlTransactionIsolatorTestingImpl.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/util/DdlTransactionIsolatorTestingImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/util/DdlTransactionIsolatorTestingImpl.java index 241f00396c..cb96aa029a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/util/DdlTransactionIsolatorTestingImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/DdlTransactionIsolatorTestingImpl.java @@ -1,4 +1,4 @@ -package org.hibernate.test.util; +package org.hibernate.orm.test.util; import java.sql.Connection; diff --git a/hibernate-core/src/test/java/org/hibernate/test/util/JoinedIterableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/JoinedIterableTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/util/JoinedIterableTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/util/JoinedIterableTest.java index c554e6cbbc..c65aa89630 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/util/JoinedIterableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/JoinedIterableTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.util; +package org.hibernate.orm.test.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/hibernate-core/src/test/java/org/hibernate/test/util/PropertiesHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/PropertiesHelperTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/util/PropertiesHelperTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/util/PropertiesHelperTest.java index bc171d357d..63c055eeee 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/util/PropertiesHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/PropertiesHelperTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.util; +package org.hibernate.orm.test.util; import java.util.Properties; import org.junit.Before; diff --git a/hibernate-core/src/test/java/org/hibernate/test/util/RowVersionComparatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/RowVersionComparatorTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/test/util/RowVersionComparatorTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/util/RowVersionComparatorTest.java index 42f3e018c7..e5d8832098 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/util/RowVersionComparatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/RowVersionComparatorTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.util; +package org.hibernate.orm.test.util; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/util/SchemaUtil.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/SchemaUtil.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/test/util/SchemaUtil.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/util/SchemaUtil.java index 3cdb27891e..3cb2a0867b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/util/SchemaUtil.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/SchemaUtil.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.util; +package org.hibernate.orm.test.util; import java.util.HashSet; import java.util.Iterator; diff --git a/hibernate-core/src/test/java/org/hibernate/test/util/SerializableThing.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/SerializableThing.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/test/util/SerializableThing.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/util/SerializableThing.java index ba00cf9eba..52954ca98a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/util/SerializableThing.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/SerializableThing.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.util; +package org.hibernate.orm.test.util; import java.io.Serializable; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/util/SerializationHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/SerializationHelperTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/test/util/SerializationHelperTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/util/SerializationHelperTest.java index ca56d92a3a..8b379d44ea 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/util/SerializationHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/SerializationHelperTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.util; +package org.hibernate.orm.test.util; import java.io.InputStream; import java.io.Serializable; @@ -44,7 +44,8 @@ public class SerializationHelperTest extends BaseUnitTestCase { @Test public void testSerializeDeserialize() throws Exception { - Class clazz = Thread.currentThread().getContextClassLoader().loadClass( "org.hibernate.test.util.SerializableThing" ); + Class clazz = Thread.currentThread().getContextClassLoader().loadClass( + "org.hibernate.orm.test.util.SerializableThing" ); Object instance = clazz.newInstance(); // SerializableType.toBytes() logic, as called from SerializableType.disassemble() @@ -89,7 +90,7 @@ public class SerializationHelperTest extends BaseUnitTestCase { if ( name.equals( "org.hibernate.LockMode" ) ) { throw new ClassNotFoundException( "Could not find "+ name ); } - if ( ! name.equals( "org.hibernate.test.util.SerializableThing" ) ) { + if ( ! name.equals( "org.hibernate.orm.test.util.SerializableThing" ) ) { return getParent().loadClass( name ); } diff --git a/hibernate-core/src/test/java/org/hibernate/test/util/StringHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/StringHelperTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/test/util/StringHelperTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/util/StringHelperTest.java index 8e18cc04fd..ccd4eb262f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/util/StringHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/StringHelperTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.util; +package org.hibernate.orm.test.util; import java.util.Arrays; diff --git a/hibernate-core/src/test/java/org/hibernate/test/util/dtd/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/Child.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/util/dtd/Child.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/Child.java index 21a623d0c0..ddd5339abe 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/util/dtd/Child.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/Child.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.util.dtd; +package org.hibernate.orm.test.util.dtd; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/util/dtd/EntityResolverTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/EntityResolverTest.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/util/dtd/EntityResolverTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/EntityResolverTest.java index 844512c961..c0efed6855 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/util/dtd/EntityResolverTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/EntityResolverTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.util.dtd; +package org.hibernate.orm.test.util.dtd; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.BootstrapServiceRegistry; @@ -25,7 +25,7 @@ public class EntityResolverTest extends BaseUnitTestCase { // which we are expecting the Hibernate custom entity resolver to be able to resolve // locally via classpath lookup. final MetadataSources metadataSources = new MetadataSources() - .addResource( "org/hibernate/test/util/dtd/Parent.hbm.xml" ); + .addResource( "org/hibernate/orm/test/util/dtd/Parent.hbm.xml" ); try { metadataSources.buildMetadata(); diff --git a/hibernate-core/src/test/java/org/hibernate/test/util/dtd/Parent.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/Parent.hbm.xml similarity index 81% rename from hibernate-core/src/test/java/org/hibernate/test/util/dtd/Parent.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/Parent.hbm.xml index cf7bbfe5e9..419330f2cf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/util/dtd/Parent.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/Parent.hbm.xml @@ -8,11 +8,11 @@ + ]> - + diff --git a/hibernate-core/src/test/java/org/hibernate/test/util/dtd/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/Parent.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/util/dtd/Parent.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/Parent.java index 6ea7f866a9..0fb95adf69 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/util/dtd/Parent.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/Parent.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.util.dtd; +package org.hibernate.orm.test.util.dtd; import java.util.HashSet; import java.util.Iterator; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/test/util/dtd/child.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/child.xml similarity index 100% rename from hibernate-core/src/test/java/org/hibernate/test/util/dtd/child.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/util/dtd/child.xml diff --git a/hibernate-core/src/test/java/org/hibernate/test/util/jdbc/PreparedStatementSpyConnectionProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/jdbc/PreparedStatementSpyConnectionProvider.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/util/jdbc/PreparedStatementSpyConnectionProvider.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/util/jdbc/PreparedStatementSpyConnectionProvider.java index 32d5b7389e..40ab9ccf77 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/util/jdbc/PreparedStatementSpyConnectionProvider.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/jdbc/PreparedStatementSpyConnectionProvider.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.util.jdbc; +package org.hibernate.orm.test.util.jdbc; import java.sql.Connection; import java.sql.PreparedStatement; @@ -111,11 +111,6 @@ public class PreparedStatementSpyConnectionProvider extends ConnectionProviderDe } Connection connectionSpy = spy( connection, settingsForConnections ); try { - // Apache Derby is object identity sensitive and calling setAutoCommit on the spy causes issues - Mockito.doAnswer( invocation -> { - connection.setAutoCommit( invocation.getArgument( 0 ) ); - return null; - }).when( connectionSpy ).setAutoCommit( Mockito.anyBoolean() ); Mockito.doAnswer( invocation -> { PreparedStatement statement = (PreparedStatement) invocation.callRealMethod(); PreparedStatement statementSpy = spy( statement, settingsForStatements ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/util/jdbc/TimeZoneConnectionProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/jdbc/TimeZoneConnectionProvider.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/test/util/jdbc/TimeZoneConnectionProvider.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/util/jdbc/TimeZoneConnectionProvider.java index f365135a5f..3febc6e88d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/util/jdbc/TimeZoneConnectionProvider.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/jdbc/TimeZoneConnectionProvider.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.util.jdbc; +package org.hibernate.orm.test.util.jdbc; import java.util.TimeZone; diff --git a/hibernate-core/src/test/java/org/hibernate/query/InClauseParameterPaddingTest.java b/hibernate-core/src/test/java/org/hibernate/query/InClauseParameterPaddingTest.java index 77860ab63f..430b978dcc 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/InClauseParameterPaddingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/query/InClauseParameterPaddingTest.java @@ -16,7 +16,6 @@ import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.jdbc.SQLStatementInterceptor; -import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; diff --git a/hibernate-core/src/test/java/org/hibernate/query/MaxInExpressionParameterPaddingTest.java b/hibernate-core/src/test/java/org/hibernate/query/MaxInExpressionParameterPaddingTest.java index eaf3bbd25c..43f85ba64b 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/MaxInExpressionParameterPaddingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/query/MaxInExpressionParameterPaddingTest.java @@ -20,7 +20,6 @@ import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.jdbc.SQLStatementInterceptor; -import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/DerivedIdentityWithBidirectionalAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/DerivedIdentityWithBidirectionalAssociationTest.java index 5a726ebb99..fffbb84236 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/DerivedIdentityWithBidirectionalAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/bidirectional/DerivedIdentityWithBidirectionalAssociationTest.java @@ -10,7 +10,7 @@ import org.hibernate.Session; import org.hibernate.testing.Skip; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/DerivedIdentitySimpleParentIdClassDepTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/DerivedIdentitySimpleParentIdClassDepTest.java index ecb246c145..4a06c5acdf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/DerivedIdentitySimpleParentIdClassDepTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/a/DerivedIdentitySimpleParentIdClassDepTest.java @@ -12,7 +12,7 @@ import org.hibernate.query.Query; import org.hibernate.Session; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/DerivedIdentityIdClassParentIdClassDepTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/DerivedIdentityIdClassParentIdClassDepTest.java index 4d03427047..042bb499b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/DerivedIdentityIdClassParentIdClassDepTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/a/DerivedIdentityIdClassParentIdClassDepTest.java @@ -9,7 +9,7 @@ package org.hibernate.test.annotations.derivedidentities.e2.a; import org.hibernate.Session; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/DerivedIdentityIdClassParentEmbeddedIdDepTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/DerivedIdentityIdClassParentEmbeddedIdDepTest.java index d4b43bba7b..ff140edddc 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/DerivedIdentityIdClassParentEmbeddedIdDepTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/DerivedIdentityIdClassParentEmbeddedIdDepTest.java @@ -9,7 +9,7 @@ package org.hibernate.test.annotations.derivedidentities.e2.b; import org.hibernate.Session; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/DerivedIdentityEmbeddedIdParentIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/DerivedIdentityEmbeddedIdParentIdClassTest.java index cc22bd3c8b..d9db69257d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/DerivedIdentityEmbeddedIdParentIdClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/a/DerivedIdentityEmbeddedIdParentIdClassTest.java @@ -9,7 +9,7 @@ package org.hibernate.test.annotations.derivedidentities.e3.a; import org.hibernate.Session; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/DerivedIdentityEmbeddedIdParentEmbeddedIdDepTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/DerivedIdentityEmbeddedIdParentEmbeddedIdDepTest.java index 0901a47b19..f5113cf612 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/DerivedIdentityEmbeddedIdParentEmbeddedIdDepTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b/DerivedIdentityEmbeddedIdParentEmbeddedIdDepTest.java @@ -9,7 +9,7 @@ package org.hibernate.test.annotations.derivedidentities.e3.b; import org.hibernate.Session; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/DerivedIdentityEmbeddedIdParentEmbeddedIdGrandparentEmbeddedIdDepTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/DerivedIdentityEmbeddedIdParentEmbeddedIdGrandparentEmbeddedIdDepTest.java index 2bcd77fbcd..8a5948a9dd 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/DerivedIdentityEmbeddedIdParentEmbeddedIdGrandparentEmbeddedIdDepTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/DerivedIdentityEmbeddedIdParentEmbeddedIdGrandparentEmbeddedIdDepTest.java @@ -24,7 +24,7 @@ package org.hibernate.test.annotations.derivedidentities.e3.b2; import org.hibernate.Session; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/DerivedIdentityEmbeddedIdParentEmbeddedIdGrandparentEmbeddedIdColumnOverridesDepTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/DerivedIdentityEmbeddedIdParentEmbeddedIdGrandparentEmbeddedIdColumnOverridesDepTest.java index 300d3772eb..e26aeed43e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/DerivedIdentityEmbeddedIdParentEmbeddedIdGrandparentEmbeddedIdColumnOverridesDepTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/DerivedIdentityEmbeddedIdParentEmbeddedIdGrandparentEmbeddedIdColumnOverridesDepTest.java @@ -24,7 +24,7 @@ package org.hibernate.test.annotations.derivedidentities.e3.b3; import org.hibernate.Session; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/DerivedIdentitySimpleParentSimpleDepTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/DerivedIdentitySimpleParentSimpleDepTest.java index 94d435644c..865f66ea51 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/DerivedIdentitySimpleParentSimpleDepTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/a/DerivedIdentitySimpleParentSimpleDepTest.java @@ -11,7 +11,7 @@ import java.util.Date; import org.hibernate.Session; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/c/DerivedIdentitySimpleParentSimpleDepSecondPassOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/c/DerivedIdentitySimpleParentSimpleDepSecondPassOrderingTest.java index e3bf9a60b0..7ee35e5f58 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/c/DerivedIdentitySimpleParentSimpleDepSecondPassOrderingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e4/c/DerivedIdentitySimpleParentSimpleDepSecondPassOrderingTest.java @@ -17,7 +17,7 @@ import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.hibernate.test.util.SchemaUtil.getColumnNames; +import static org.hibernate.orm.test.util.SchemaUtil.getColumnNames; /** * Test that when an entity with derived identity is referenced from a third entity, diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/DerivedIdentityIdClassParentSameIdTypeIdClassDepTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/DerivedIdentityIdClassParentSameIdTypeIdClassDepTest.java index 3c6b57c694..504b5ee21e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/DerivedIdentityIdClassParentSameIdTypeIdClassDepTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/a/DerivedIdentityIdClassParentSameIdTypeIdClassDepTest.java @@ -9,7 +9,7 @@ package org.hibernate.test.annotations.derivedidentities.e5.a; import org.hibernate.Session; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/DerivedIdentityIdClassParentSameIdTypeEmbeddedIdDepTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/DerivedIdentityIdClassParentSameIdTypeEmbeddedIdDepTest.java index 1d54996a06..9f8f8196c6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/DerivedIdentityIdClassParentSameIdTypeEmbeddedIdDepTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e5/b/DerivedIdentityIdClassParentSameIdTypeEmbeddedIdDepTest.java @@ -9,7 +9,7 @@ package org.hibernate.test.annotations.derivedidentities.e5.b; import org.hibernate.Session; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java index fd78fb80e6..f265ed09c6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java @@ -9,7 +9,7 @@ package org.hibernate.test.annotations.derivedidentities.e6.a; import org.hibernate.Session; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/DerivedIdentityEmbeddedIdParentSameIdTypeEmbeddedIdDepTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/DerivedIdentityEmbeddedIdParentSameIdTypeEmbeddedIdDepTest.java index a1620158ee..e2e68c1db5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/DerivedIdentityEmbeddedIdParentSameIdTypeEmbeddedIdDepTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/b/DerivedIdentityEmbeddedIdParentSameIdTypeEmbeddedIdDepTest.java @@ -9,7 +9,7 @@ package org.hibernate.test.annotations.derivedidentities.e6.b; import org.hibernate.Session; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.SchemaUtil; +import org.hibernate.orm.test.util.SchemaUtil; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneTest.java index 392e8ccdb7..c3f90fdfda 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneTest.java @@ -18,10 +18,10 @@ import org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyJpaImpl; import org.hibernate.cfg.Configuration; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.hibernate.test.annotations.Company; +import org.hibernate.orm.test.annotations.Company; import org.hibernate.test.annotations.Customer; import org.hibernate.test.annotations.Discount; -import org.hibernate.test.annotations.Flight; +import org.hibernate.orm.test.annotations.Flight; import org.hibernate.test.annotations.Passport; import org.hibernate.test.annotations.Ticket; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/MySQLDropConstraintThrowsExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/MySQLDropConstraintThrowsExceptionTest.java index 34f4911f54..eeaef3ab78 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/MySQLDropConstraintThrowsExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/MySQLDropConstraintThrowsExceptionTest.java @@ -30,7 +30,7 @@ import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider; +import org.hibernate.orm.test.util.jdbc.PreparedStatementSpyConnectionProvider; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/ondemandload/OnDemandLoadTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/ondemandload/OnDemandLoadTest.java index e242c1c3a0..8d78290c49 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/ondemandload/OnDemandLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/ondemandload/OnDemandLoadTest.java @@ -34,8 +34,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.hibernate.test.bytecode.enhancement.merge.MergeEnhancedEntityTest; - import static org.hibernate.Hibernate.isPropertyInitialized; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/multitenancy/discriminator/DiscriminatorMultiTenancyTest.java b/hibernate-core/src/test/java/org/hibernate/test/multitenancy/discriminator/DiscriminatorMultiTenancyTest.java index 6600182eb2..9875f6f7b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/multitenancy/discriminator/DiscriminatorMultiTenancyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/multitenancy/discriminator/DiscriminatorMultiTenancyTest.java @@ -37,7 +37,7 @@ import org.hibernate.testing.env.ConnectionProviderBuilder; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.transaction.TransactionUtil; import org.hibernate.test.multitenancy.schema.Customer; -import org.hibernate.test.util.DdlTransactionIsolatorTestingImpl; +import org.hibernate.orm.test.util.DdlTransactionIsolatorTestingImpl; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/AbstractSchemaBasedMultiTenancyTest.java b/hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/AbstractSchemaBasedMultiTenancyTest.java index da363d9bee..6c104a23ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/AbstractSchemaBasedMultiTenancyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/AbstractSchemaBasedMultiTenancyTest.java @@ -30,7 +30,7 @@ import org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase; import org.hibernate.testing.cache.CachingRegionFactory; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.util.DdlTransactionIsolatorTestingImpl; +import org.hibernate.orm.test.util.DdlTransactionIsolatorTestingImpl; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/hibernate-core/src/test/java/org/hibernate/test/querytimeout/QueryTimeOutTest.java b/hibernate-core/src/test/java/org/hibernate/test/querytimeout/QueryTimeOutTest.java index 9298b7c143..898b7b8a50 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/querytimeout/QueryTimeOutTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/querytimeout/QueryTimeOutTest.java @@ -11,7 +11,6 @@ import java.util.Map; import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.QueryHint; import javax.persistence.Table; import org.hibernate.cfg.AvailableSettings; @@ -24,7 +23,7 @@ import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider; +import org.hibernate.orm.test.util.jdbc.PreparedStatementSpyConnectionProvider; import org.junit.Before; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/quote/TableGeneratorQuotingTest.java b/hibernate-core/src/test/java/org/hibernate/test/quote/TableGeneratorQuotingTest.java index f87ea73575..418deaddc5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/quote/TableGeneratorQuotingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/quote/TableGeneratorQuotingTest.java @@ -28,7 +28,7 @@ import org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.hibernate.test.util.DdlTransactionIsolatorTestingImpl; +import org.hibernate.orm.test.util.DdlTransactionIsolatorTestingImpl; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimeCustomTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimeCustomTimeZoneTest.java index 84c152be58..afff831ec3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimeCustomTimeZoneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimeCustomTimeZoneTest.java @@ -28,7 +28,7 @@ import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider; +import org.hibernate.orm.test.util.jdbc.PreparedStatementSpyConnectionProvider; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimeDefaultTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimeDefaultTimeZoneTest.java index 0c8f09f7fb..1c764b66b6 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimeDefaultTimeZoneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimeDefaultTimeZoneTest.java @@ -20,7 +20,7 @@ import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider; +import org.hibernate.orm.test.util.jdbc.PreparedStatementSpyConnectionProvider; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampCustomSessionLevelTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampCustomSessionLevelTimeZoneTest.java index 1cc0d02be6..8a1d77fc0d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampCustomSessionLevelTimeZoneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampCustomSessionLevelTimeZoneTest.java @@ -25,7 +25,7 @@ import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider; +import org.hibernate.orm.test.util.jdbc.PreparedStatementSpyConnectionProvider; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampCustomTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampCustomTimeZoneTest.java index a7be6e01ee..3fdb7cc0d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampCustomTimeZoneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampCustomTimeZoneTest.java @@ -25,7 +25,7 @@ import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider; +import org.hibernate.orm.test.util.jdbc.PreparedStatementSpyConnectionProvider; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampDefaultTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampDefaultTimeZoneTest.java index 1ad16d8122..80f78e2915 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampDefaultTimeZoneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampDefaultTimeZoneTest.java @@ -19,7 +19,7 @@ import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider; +import org.hibernate.orm.test.util.jdbc.PreparedStatementSpyConnectionProvider; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampUTCTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampUTCTimeZoneTest.java index 68ea20f04a..4ceac4fbdf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampUTCTimeZoneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampUTCTimeZoneTest.java @@ -14,7 +14,7 @@ import org.hibernate.dialect.PostgreSQL82Dialect; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.testing.RequiresDialect; -import org.hibernate.test.util.jdbc.TimeZoneConnectionProvider; +import org.hibernate.orm.test.util.jdbc.TimeZoneConnectionProvider; /** * @author Vlad Mihalcea diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampWithDefaultUTCTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampWithDefaultUTCTimeZoneTest.java index 7cc4a08ac6..a01b4dcc6d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampWithDefaultUTCTimeZoneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampWithDefaultUTCTimeZoneTest.java @@ -13,7 +13,7 @@ import org.hibernate.dialect.PostgreSQL82Dialect; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.testing.RequiresDialect; -import org.hibernate.test.util.jdbc.TimeZoneConnectionProvider; +import org.hibernate.orm.test.util.jdbc.TimeZoneConnectionProvider; /** * @author Vlad Mihalcea diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampWithoutUTCTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampWithoutUTCTimeZoneTest.java index c1cb8f6530..d02c768fd3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampWithoutUTCTimeZoneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/timestamp/JdbcTimestampWithoutUTCTimeZoneTest.java @@ -23,7 +23,7 @@ import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.util.jdbc.TimeZoneConnectionProvider; +import org.hibernate.orm.test.util.jdbc.TimeZoneConnectionProvider; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/test/tm/JtaBeforeCompletionFailureTest.java b/hibernate-core/src/test/java/org/hibernate/test/tm/JtaBeforeCompletionFailureTest.java index 30c256787f..cc957056b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/tm/JtaBeforeCompletionFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/tm/JtaBeforeCompletionFailureTest.java @@ -12,7 +12,6 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.transaction.RollbackException; import javax.transaction.Status; -import javax.transaction.SystemException; import javax.transaction.TransactionManager; import org.hibernate.JDBCException; @@ -23,11 +22,9 @@ import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.hibernate.test.resource.transaction.jta.JtaPlatformStandardTestingImpl; +import org.hibernate.orm.test.resource.transaction.jta.JtaPlatformStandardTestingImpl; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/hibernate-core/src/test/java/org/hibernate/test/usertype/IntegratorProvidedUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/usertype/IntegratorProvidedUserTypeTest.java index fb015b2a16..c6193f76c8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/usertype/IntegratorProvidedUserTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/usertype/IntegratorProvidedUserTypeTest.java @@ -16,7 +16,6 @@ import javax.persistence.Entity; import javax.persistence.Id; import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder; -import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.internal.util.ConfigHelper; import org.hibernate.type.CustomType; import org.hibernate.type.Type; @@ -67,7 +66,7 @@ public class IntegratorProvidedUserTypeTest extends BaseCoreFunctionalTestCase { protected Enumeration findResources(String name) throws IOException { if (name.equals( "META-INF/services/org.hibernate.integrator.spi.Integrator" )) { final URL serviceUrl = ConfigHelper.findAsResource( - "org/hibernate/test/service/org.hibernate.integrator.spi.Integrator" ); + "org/hibernate/orm/test/service/org.hibernate.integrator.spi.Integrator" ); return new Enumeration() { boolean hasMore = true; diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/bytecode/Hammer.hbm.xml similarity index 88% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/bytecode/Hammer.hbm.xml index 790116cb09..f090f095c6 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/bytecode/Hammer.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/configuration/orm.xml similarity index 100% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/configuration/orm.xml diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/duplicatedgenerator/orm.xml similarity index 100% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/duplicatedgenerator/orm.xml diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/enumerated/ormXml/orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/enumerated/ormXml/orm.xml similarity index 85% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/enumerated/ormXml/orm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/enumerated/ormXml/orm.xml index 257f2c0947..5fa365b716 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/enumerated/ormXml/orm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/enumerated/ormXml/orm.xml @@ -6,7 +6,7 @@ --> - + diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/fetchprofile/mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/fetchprofile/mappings.hbm.xml similarity index 100% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/fetchprofile/mappings.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/fetchprofile/mappings.hbm.xml diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/index/jpa/orm-index.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/index/jpa/orm-index.xml similarity index 97% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/index/jpa/orm-index.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/index/jpa/orm-index.xml index 222f96c0fc..179dc88d34 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/index/jpa/orm-index.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/index/jpa/orm-index.xml @@ -8,7 +8,7 @@ --> - org.hibernate.test.annotations.index.jpa + org.hibernate.orm.test.annotations.index.jpa diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/orm.xml similarity index 100% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/orm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/orm.xml diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/reflection/element-collection-converter-orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/reflection/element-collection-converter-orm.xml similarity index 80% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/reflection/element-collection-converter-orm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/reflection/element-collection-converter-orm.xml index f9645901df..3ed0858afc 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/reflection/element-collection-converter-orm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/reflection/element-collection-converter-orm.xml @@ -11,11 +11,11 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence/orm orm_2_1.xsd" version="2.1" > - org.hibernate.test.annotations.reflection + org.hibernate.orm.test.annotations.reflection - + diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/reflection/metadata-complete.xml similarity index 97% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/reflection/metadata-complete.xml index 1f655f91e4..f2a2ba5ec0 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/reflection/metadata-complete.xml @@ -19,7 +19,7 @@ - org.hibernate.test.annotations.reflection + org.hibernate.orm.test.annotations.reflection diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/reflection/orm.xml similarity index 91% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/reflection/orm.xml index 8fd8d340b5..34f32742d8 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/reflection/orm.xml @@ -17,13 +17,13 @@ mycatalog - + - org.hibernate.test.annotations.reflection + org.hibernate.orm.test.annotations.reflection
@@ -86,7 +86,7 @@ - + @@ -116,14 +116,14 @@ - + Physical - + diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm1.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm1.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm1.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm1.xml index 28069c46d6..ca92ed2aa6 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm1.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm1.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm10.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm10.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm10.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm10.xml index 5c22a97197..23b7756a35 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm10.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm10.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm11.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm11.xml similarity index 94% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm11.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm11.xml index b94cd95979..7626085150 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm11.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm11.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm12.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm12.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm12.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm12.xml index 1483e2733b..3f82b76f58 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm12.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm12.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm13.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm13.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm13.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm13.xml index 3cb44da2ce..eb40d0db98 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm13.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm13.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm14.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm14.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm14.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm14.xml index 85981e1add..5f0452be1a 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm14.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm14.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm15.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm15.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm15.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm15.xml index cbae02a8ab..fb60e9a009 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm15.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm15.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm16.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm16.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm16.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm16.xml index 2bae05b57d..141d1999d8 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm16.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm16.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm17.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm17.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm17.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm17.xml index 1d6e74e1d3..46e920eb14 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm17.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm17.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm18.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm18.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm18.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm18.xml index f407633067..4ccab61f21 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm18.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm18.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm19.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm19.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm19.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm19.xml index e6bf80304f..e1d047c4b5 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm19.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm19.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm2.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm2.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm2.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm2.xml index bf2a6a8aa2..34f9ba1c79 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm2.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm2.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm20.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm20.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm20.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm20.xml index b91b111459..5b70083bd8 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm20.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm20.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm21.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm21.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm21.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm21.xml index a931c14cf2..c37a598aa4 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm21.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm21.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm22.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm22.xml similarity index 94% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm22.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm22.xml index dbbeff30a8..f17e03b84a 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm22.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm22.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm23.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm23.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm23.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm23.xml index 61694835c6..906fe21646 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm23.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm23.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm24.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm24.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm24.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm24.xml index fed44a9273..0e8d764232 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm24.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm24.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm25.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm25.xml similarity index 96% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm25.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm25.xml index 588e736439..e2e0cb158d 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm25.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm25.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm26.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm26.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm26.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm26.xml index da32d0a360..33a8a84a6f 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm26.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm26.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm27.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm27.xml similarity index 95% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm27.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm27.xml index 3cbad2a217..2efb0fc0f4 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm27.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm27.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm28.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm28.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm28.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm28.xml index a5752f3ba0..188f8a00d5 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm28.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm28.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm4.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm4.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm4.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm4.xml index b302bb63a0..4a75af9809 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm4.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm4.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm5.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm5.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm5.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm5.xml index 35af034873..3824783e07 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm5.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm5.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm6.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm6.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm6.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm6.xml index 4201588fcf..74f04d0e90 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm6.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm6.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm7.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm7.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm7.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm7.xml index 62d4788343..02dbde0728 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm7.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm7.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm8.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm8.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm8.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm8.xml index 71943dcd48..c28af626cd 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm8.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm8.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm9.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm9.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm9.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm9.xml index ed3fb21a4c..dbe76c9be1 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm9.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/element-collection.orm9.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm1.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm1.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm1.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm1.xml index 12658b8592..e4b9023656 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm1.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm1.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm10.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm10.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm10.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm10.xml index cbc6f1db34..d3032b34c2 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm10.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm10.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm11.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm11.xml similarity index 94% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm11.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm11.xml index d0ef2eb892..7dabe7bb7b 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm11.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm11.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm12.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm12.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm12.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm12.xml index b4da699b7a..99eb48ae91 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm12.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm12.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm13.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm13.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm13.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm13.xml index 3d8b770200..e6cf9752c7 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm13.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm13.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm14.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm14.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm14.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm14.xml index aa62561ebd..7fbedc04c0 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm14.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm14.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm15.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm15.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm15.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm15.xml index 1ea5b955a9..f5f1e94430 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm15.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm15.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm16.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm16.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm16.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm16.xml index 7a08eb9ca6..a6ceed5652 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm16.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm16.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm17.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm17.xml similarity index 95% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm17.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm17.xml index 6560003a49..a11bb2d3b3 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm17.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm17.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm18.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm18.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm18.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm18.xml index cd5f63fde1..a165b1a19b 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm18.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm18.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm19.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm19.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm19.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm19.xml index 5f1b0d6223..4fa0717991 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm19.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm19.xml @@ -16,7 +16,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm2.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm2.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm2.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm2.xml index 52900ac55c..61efab3aaa 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm2.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm2.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm20.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm20.xml similarity index 94% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm20.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm20.xml index 01bb26fa62..8aad7829c0 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm20.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm20.xml @@ -16,7 +16,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm21.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm21.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm21.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm21.xml index e715c9f87e..320065a049 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm21.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm21.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm4.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm4.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm4.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm4.xml index 0d262c73a4..b94f7177b0 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm4.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm4.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm5.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm5.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm5.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm5.xml index b3cf7eebfd..b722e7f117 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm5.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm5.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm6.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm6.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm6.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm6.xml index 0cb3eeddbf..b0ece037a7 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm6.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm6.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm7.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm7.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm7.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm7.xml index e41eed1c99..ab9a1c335a 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm7.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm7.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm8.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm8.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm8.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm8.xml index 1b4e2ec1f5..ccb3218de6 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm8.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm8.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm9.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm9.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm9.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm9.xml index ce23955c83..7a6bea46d6 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm9.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-many.orm9.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm1.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm1.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm1.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm1.xml index b1347f7d40..a1aab0e281 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm1.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm1.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm2.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm2.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm2.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm2.xml index 6cd1de5857..41ada9dfa2 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm2.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm2.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm3.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm3.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm3.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm3.xml index ed9140cba4..f557364106 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm3.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm3.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm4.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm4.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm4.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm4.xml index 41c3b8cb80..6b68c88ea8 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm4.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm4.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm5.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm5.xml similarity index 95% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm5.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm5.xml index 9ae2ff1f9d..2aebc97193 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm5.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm5.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm6.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm6.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm6.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm6.xml index aa4dbeb547..812c8a9acc 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm6.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm6.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm8.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm8.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm8.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm8.xml index ade7e1eed4..169f779299 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm8.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm8.xml @@ -16,7 +16,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm9.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm9.xml similarity index 94% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm9.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm9.xml index cd0e1a362f..da69d7ac0f 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm9.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/many-to-one.orm9.xml @@ -16,7 +16,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm1.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm1.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm1.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm1.xml index 657acb4481..fddbbd0bdb 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm1.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm1.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm10.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm10.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm10.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm10.xml index 5988d5a95a..adf14b38a9 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm10.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm10.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm11.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm11.xml similarity index 94% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm11.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm11.xml index 53603493d8..ac90a27ed8 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm11.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm11.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm12.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm12.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm12.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm12.xml index 923a292c23..01affe509f 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm12.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm12.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm13.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm13.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm13.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm13.xml index 28713127d0..9d84c66324 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm13.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm13.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm14.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm14.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm14.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm14.xml index 48697da08a..f753bca627 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm14.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm14.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm15.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm15.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm15.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm15.xml index a2a9e64782..733ce9d811 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm15.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm15.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm16.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm16.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm16.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm16.xml index 76b7cb507d..1c8a2a600c 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm16.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm16.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm17.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm17.xml similarity index 95% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm17.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm17.xml index 06d59f11ad..8f20a72f3f 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm17.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm17.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm18.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm18.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm18.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm18.xml index b9cb605eb4..ba419609c9 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm18.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm18.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm19.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm19.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm19.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm19.xml index 6ebe39f884..2df83482fc 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm19.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm19.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm2.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm2.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm2.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm2.xml index 35850ea3a5..44f0c42c88 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm2.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm2.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm20.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm20.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm20.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm20.xml index 163a67dd34..30af2b2ba4 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm20.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm20.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm21.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm21.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm21.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm21.xml index 02cc3e4f6b..5092525478 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm21.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm21.xml @@ -16,7 +16,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm22.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm22.xml similarity index 94% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm22.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm22.xml index 2093ed0d89..b08a2702db 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm22.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm22.xml @@ -16,7 +16,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm23.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm23.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm23.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm23.xml index e8431123d3..64294794c0 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm23.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm23.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm4.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm4.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm4.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm4.xml index 01728d88e7..43dcc4f1e8 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm4.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm4.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm5.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm5.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm5.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm5.xml index 5c41d2df42..1aee0102eb 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm5.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm5.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm6.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm6.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm6.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm6.xml index e71715f6a5..39a41a19ba 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm6.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm6.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm7.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm7.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm7.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm7.xml index 5fc80da96e..1e0116c36d 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm7.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm7.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm8.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm8.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm8.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm8.xml index 1c3078c745..6be1083183 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm8.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm8.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm9.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm9.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm9.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm9.xml index 75361b1477..5afb9234aa 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm9.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-many.orm9.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm1.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm1.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm1.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm1.xml index 7178a5c130..d574b75f44 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm1.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm1.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm10.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm10.xml similarity index 94% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm10.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm10.xml index 81b8abc883..632249987b 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm10.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm10.xml @@ -16,7 +16,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm11.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm11.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm11.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm11.xml index d26f644ab7..e68bd59afb 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm11.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm11.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm3.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm3.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm3.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm3.xml index af58691aa4..5880d6b59f 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm3.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm3.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm4.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm4.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm4.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm4.xml index bcc22c71e6..bd633f9b51 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm4.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm4.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm5.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm5.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm5.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm5.xml index 9ed950e889..2198c0c8bf 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm5.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm5.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm6.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm6.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm6.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm6.xml index 8d77958b76..ffc6b9e671 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm6.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm6.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm7.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm7.xml similarity index 95% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm7.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm7.xml index 79e40c3735..424a767afc 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm7.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm7.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm8.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm8.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm8.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm8.xml index cf06a5dce6..16952b7215 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm8.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm8.xml @@ -13,7 +13,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm9.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm9.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm9.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm9.xml index 3fafdb72ec..43409f3276 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm9.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/one-to-one.orm9.xml @@ -16,7 +16,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/orm.xml similarity index 97% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/orm.xml index 57e0064852..d50d81a2f8 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/orm.xml @@ -14,7 +14,7 @@ - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 select m from Manufacturer m diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/orm2.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/orm2.xml index dfe39b8963..d4a529d085 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/orm2.xml @@ -12,7 +12,7 @@ version="1.0" > - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 select l from Light l diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/orm3.xml similarity index 92% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/orm3.xml index b0f29c5199..5ec6900edc 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/orm3.xml @@ -10,7 +10,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm/orm_2_0.xsd" version="2.0"> - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm4.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/orm4.xml similarity index 96% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm4.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/orm4.xml index 5978568a32..c301f4ad9a 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm4.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/orm4.xml @@ -11,7 +11,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm/orm_2_0.xsd" version="2.0"> - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm5.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/orm5.xml similarity index 93% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm5.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/orm5.xml index 710606f22e..044c7282a0 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm5.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/orm5.xml @@ -12,7 +12,7 @@ version="2020" > - org.hibernate.test.annotations.xml.ejb3 + org.hibernate.orm.test.annotations.xml.ejb3 select l from Light l diff --git a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/pre-parsed-orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/pre-parsed-orm.xml similarity index 84% rename from hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/pre-parsed-orm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/pre-parsed-orm.xml index bc06432f18..eee865490e 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/pre-parsed-orm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/xml/ejb3/pre-parsed-orm.xml @@ -9,7 +9,7 @@ xmlns="http://java.sun.com/xml/ns/persistence/orm" version="2.0"> - + diff --git a/hibernate-core/src/test/resources/org/hibernate/test/service/org.hibernate.integrator.spi.Integrator b/hibernate-core/src/test/resources/org/hibernate/orm/test/service/org.hibernate.integrator.spi.Integrator similarity index 56% rename from hibernate-core/src/test/resources/org/hibernate/test/service/org.hibernate.integrator.spi.Integrator rename to hibernate-core/src/test/resources/org/hibernate/orm/test/service/org.hibernate.integrator.spi.Integrator index 0f46bd3b38..7cf45d14d4 100644 --- a/hibernate-core/src/test/resources/org/hibernate/test/service/org.hibernate.integrator.spi.Integrator +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/service/org.hibernate.integrator.spi.Integrator @@ -1,2 +1,2 @@ -org.hibernate.test.service.TestIntegrator +org.hibernate.orm.test.service.TestIntegrator org.hibernate.test.usertype.StringWrapperUserTypeIntegrator \ No newline at end of file diff --git a/hibernate-hikaricp/src/test/java/org/hibernate/test/util/PreparedStatementSpyConnectionProvider.java b/hibernate-hikaricp/src/test/java/org/hibernate/orm/test/util/PreparedStatementSpyConnectionProvider.java similarity index 99% rename from hibernate-hikaricp/src/test/java/org/hibernate/test/util/PreparedStatementSpyConnectionProvider.java rename to hibernate-hikaricp/src/test/java/org/hibernate/orm/test/util/PreparedStatementSpyConnectionProvider.java index 7fdd38ef2c..1eee39de55 100644 --- a/hibernate-hikaricp/src/test/java/org/hibernate/test/util/PreparedStatementSpyConnectionProvider.java +++ b/hibernate-hikaricp/src/test/java/org/hibernate/orm/test/util/PreparedStatementSpyConnectionProvider.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.test.util; +package org.hibernate.orm.test.util; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPSkipAutoCommitTest.java b/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPSkipAutoCommitTest.java index 491ceb6088..2049890329 100644 --- a/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPSkipAutoCommitTest.java +++ b/hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariCPSkipAutoCommitTest.java @@ -18,7 +18,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.hibernate.test.util.PreparedStatementSpyConnectionProvider; +import org.hibernate.orm.test.util.PreparedStatementSpyConnectionProvider; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java b/hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java index f457d0ebf4..acf2e6cd9c 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java @@ -9,6 +9,7 @@ package org.hibernate.testing; import org.hibernate.dialect.AbstractHANADialect; import org.hibernate.dialect.CockroachDialect; import org.hibernate.dialect.DB2Dialect; +import org.hibernate.dialect.DerbyDialect; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.FirebirdDialect; import org.hibernate.dialect.HANAColumnStoreDialect; @@ -268,9 +269,7 @@ abstract public class DialectChecks { public static class SupportsJdbcDriverProxying implements DialectCheck { public boolean isMatch(Dialect dialect) { - return !( - dialect instanceof DB2Dialect - ); + return !( dialect instanceof DB2Dialect ) && !( dialect instanceof DerbyDialect ); } } diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseNonConfigCoreFunctionalTestCase.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseNonConfigCoreFunctionalTestCase.java index 8433491611..fb074c6c72 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseNonConfigCoreFunctionalTestCase.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseNonConfigCoreFunctionalTestCase.java @@ -510,7 +510,7 @@ public class BaseNonConfigCoreFunctionalTestCase extends BaseUnitTestCase { protected void cleanupTestData() throws Exception { doInHibernate(this::sessionFactory, s -> { - s.createQuery("delete from java.lang.Object").executeUpdate(); + s.createQuery( "from java.lang.Object" ).getResultList().forEach( s::delete ); }); } diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java index a831c12f36..9cd140e825 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java @@ -145,7 +145,7 @@ abstract public class DialectFeatureChecks { public static class SupportsJdbcDriverProxying implements DialectFeatureCheck { public boolean apply(Dialect dialect) { - return !( dialect instanceof DB2Dialect ); + return !( dialect instanceof DB2Dialect ) && !( dialect instanceof DerbyDialect ); } }