From b176814b44260bb086cd32b93a3693c4eff06311 Mon Sep 17 00:00:00 2001 From: Andrea Boriero Date: Wed, 7 Apr 2021 19:25:07 +0200 Subject: [PATCH] Re-enable envers test --- .../internal/GlobalConfiguration.java | 2 +- .../basic/BasicTypeColumnDefinitionTest.java | 4 +-- .../basic/ColumnScalePrecisionTest.java | 11 +++--- .../EntitySameMapKeyMultiMapValueTest.java | 4 +-- .../integration/collection/EnumMapTest.java | 8 ++--- .../test/integration/collection/EnumSet.java | 12 +++---- .../StringMapNationalizedLobTest.java | 15 ++++---- .../collection/mapkey/ComponentMapKey.java | 12 +++---- .../mapkey/ComponentMapKeyEntity.java | 4 +-- .../collection/mapkey/IdMapKey.java | 8 ++--- .../collection/mapkey/IdMapKeyEntity.java | 2 +- .../mapkey/MapKeyEnumeratedNonEntityTest.java | 8 ++--- .../mapkey/MapKeyEnumeratedTest.java | 6 ++-- .../EmbeddableWithCollectionTest.java | 4 +-- .../dynamic/AuditedDynamicComponentTest.java | 6 ++-- .../integration/customtype/EnumTypeTest.java | 6 ++-- .../customtype/ExtendedEnumTypeTest.java | 5 ++- .../customtype/ObjectUserTypeTest.java | 4 +-- .../customtype/ParametrizedCustom.java | 6 ++-- .../customtype/UnspecifiedEnumTypeTest.java | 6 ++-- .../envers/test/integration/data/Dates.java | 4 +-- .../envers/test/integration/data/Enums.java | 4 +-- .../integration/data/LobSerializables.java | 2 +- .../envers/test/integration/data/Lobs.java | 4 +-- .../test/integration/data/Serializables.java | 4 +-- ...tedDynamicComponentsAdvancedCasesTest.java | 15 +++++--- .../generated/GeneratedColumnTest.java | 4 +-- .../joined/JoinedAllAuditedTest.java | 4 +-- .../test/integration/ids/CompositeIds.java | 18 +++++----- .../embeddedid/EmbeddedIdGenericsTest.java | 4 +-- ...elationInsideEmbeddableNotAuditedTest.java | 4 +-- .../RelationInsideEmbeddableTest.java | 10 ++++-- .../ids/idclass/IdClassWithRelationTest.java | 9 +++-- .../inheritance/joined/ChildAuditing.java | 4 +-- .../inheritance/joined/ChildNullAuditing.java | 4 +-- .../DiscriminatorJoinedInheritanceTest.java | 4 +-- .../inheritance/joined/ParentAuditing.java | 4 +-- .../childrelation/ChildReferencing.java | 6 ++-- .../joined/emptychild/EmptyChildAuditing.java | 4 +-- .../NotOwnedBidirectional.java | 6 ++-- .../ChildPrimaryKeyJoinAuditing.java | 4 +-- .../relation/ParentReferencingChildTest.java | 6 ++-- .../relation/PolymorphicCollection.java | 6 ++-- .../UnidirectionalDoubleAbstract.java | 4 +-- .../MixedInheritanceStrategiesEntityTest.java | 4 +-- .../childrelation/ChildReferencing.java | 6 ++-- .../BidirectionalManyToOneOptionalTest.java | 4 +-- .../bidirectional/ImplicitMappedByTest.java | 6 ++-- .../foreignkey/ForeignKeyExclusionTest.java | 2 +- .../integration/manytoone/lazy/ChildUser.java | 3 -- .../lazy/ManyToOneLazyDeleteTest.java | 6 ++-- .../lazy/ManyToOneLazyFetchTest.java | 4 +-- .../test/integration/manytoone/lazy/User.java | 1 - .../BasicWhereJoinTable.java | 12 +++---- .../modifiedflags/HasChangedAPITest.java | 11 +++--- .../HasChangedBidirectional2.java | 11 +++--- .../HasChangedChildAuditing.java | 7 ++-- .../HasChangedChildReferencing.java | 7 ++-- .../modifiedflags/HasChangedEnumSet.java | 13 +++---- .../HasChangedForDefaultNotUsing.java | 17 ++++----- .../HasChangedNotOwnedBidirectional.java | 7 ++-- .../ImprovedColumnNamingStrategyTest.java | 2 +- .../LegacyColumnNamingStrategyTest.java | 2 +- .../naming/AuditColumnNameTest.java | 8 +++-- ...ionsJoinTableRangeComponentNamingTest.java | 10 ++++-- .../EntityResultNativeQueryTest.java | 4 +-- .../naturalid/JoinColumnNaturalIdTest.java | 4 +-- .../PropertyNotUpdatableTest.java | 4 +-- ...nceIndexedJoinColumnBidirectionalList.java | 10 +++--- .../onetomany/embeddedid/MapsIdTest.java | 7 ++-- .../onetomany/hierarchy/HierarchyTest.java | 6 ++-- .../idclass/OneToManyCompositeKeyTest.java | 8 +++-- .../BidirectionalOneToOneOptionalTest.java | 7 ++-- .../AssociationToOneInnerJoinQueryTest.java | 10 +++--- ...eritanceAssociationToOneInnerJoinTest.java | 4 +-- .../integration/query/OrderByLimitQuery.java | 6 ++-- .../query/OrderByOneAuditEntityTest.java | 2 +- .../query/OrderByThreeEntityTest.java | 2 +- .../query/OrderByTwoEntityOneAuditedTest.java | 2 +- .../query/OrderByTwoEntityTest.java | 2 +- .../query/ids/EmbIdOneToManyQuery.java | 12 +++---- .../ids/EmbeddedIdRelatedIdQueryTest.java | 4 +-- .../query/ids/IdClassRelatedIdQueryTest.java | 4 +-- .../query/ids/MulIdOneToManyQuery.java | 12 +++---- .../ids/MultipleIdRelatedIdQueryTest.java | 4 +-- .../ReadWriteExpressionChange.java | 4 +-- ...LongRevEntityInheritanceChildAuditing.java | 5 +-- .../integration/secondary/BasicSecondary.java | 4 +-- .../secondary/NamingSecondary.java | 4 +-- .../secondary/ids/EmbIdSecondary.java | 6 ++-- .../secondary/ids/MulIdSecondary.java | 6 ++-- .../ids/SecondaryEmbIdTestEntity.java | 2 +- .../ids/SecondaryMulIdTestEntity.java | 2 +- .../test/envers}/AbstractEnversTest.java | 2 +- .../test/envers}/AbstractOneSessionTest.java | 2 +- .../envers}/BaseEnversFunctionalTestCase.java | 2 +- .../BaseEnversJPAFunctionalTestCase.java | 4 +-- .../test/envers}/EnversRunner.java | 2 +- .../test/envers}/JpaStaticMetamodelTest.java | 2 +- .../test => orm/test/envers}/Priority.java | 2 +- .../entities/IntNoAutoIdTestEntity.java | 2 +- .../test/envers}/entities/IntTestEntity.java | 2 +- .../entities/IntTestPrivSeqEntity.java | 2 +- .../envers}/entities/PrimitiveTestEntity.java | 2 +- .../envers}/entities/StrIntTestEntity.java | 2 +- .../test/envers}/entities/StrTestEntity.java | 2 +- .../entities/StrTestEntityComparator.java | 2 +- .../entities/StrTestNoProxyEntity.java | 2 +- .../entities/StrTestPrivSeqEntity.java | 2 +- .../envers}/entities/UnversionedEntity.java | 2 +- .../entities/UnversionedStrTestEntity.java | 2 +- .../collection/EmbeddableListEntity1.java | 4 +-- .../collection/EmbeddableListEntity2.java | 4 +-- .../collection/EmbeddableListEntity3.java | 4 +-- .../collection/EmbeddableMapEntity.java | 4 +-- .../collection/EmbeddableSetEntity.java | 4 +-- .../entities/collection/EnumMapEntity.java | 2 +- .../entities/collection/EnumMapType.java | 2 +- .../entities/collection/EnumSetEntity.java | 2 +- .../collection/MultipleCollectionEntity.java | 2 +- .../MultipleCollectionRefEntity1.java | 2 +- .../MultipleCollectionRefEntity2.java | 2 +- .../entities/collection/StringListEntity.java | 2 +- .../entities/collection/StringMapEntity.java | 2 +- .../entities/collection/StringSetEntity.java | 2 +- .../entities/components/Component1.java | 2 +- .../entities/components/Component2.java | 2 +- .../entities/components/Component3.java | 2 +- .../entities/components/Component4.java | 2 +- .../components/ComponentSetTestEntity.java | 2 +- .../components/ComponentTestEntity.java | 2 +- .../components/DefaultValueComponent1.java | 2 +- .../components/DefaultValueComponent2.java | 2 +- .../DefaultValueComponentTestEntity.java | 2 +- .../components/UniquePropsEntity.java | 2 +- .../UniquePropsNotAuditedEntity.java | 2 +- .../relations/ManyToOneComponent.java | 4 +-- .../ManyToOneComponentTestEntity.java | 2 +- .../relations/ManyToOneEagerComponent.java | 4 +-- .../NotAuditedManyToOneComponent.java | 4 +-- ...otAuditedManyToOneComponentTestEntity.java | 2 +- .../relations/OneToManyComponent.java | 4 +-- .../OneToManyComponentTestEntity.java | 2 +- .../entities/converter/BasicModelingTest.java | 6 ++-- .../envers}/entities/converter/Person.java | 2 +- .../test/envers}/entities/converter/Sex.java | 2 +- .../entities/converter/SexConverter.java | 2 +- .../entities/customtype/Component.java | 2 +- .../entities/customtype/EnumTypeEntity.java | 2 +- .../ParametrizedCustomTypeEntity.java | 2 +- .../customtype/ParametrizedTestUserType.java | 2 +- .../customtype/UnspecifiedEnumTypeEntity.java | 2 +- .../ids/CompositeDateIdTestEntity.java | 2 +- .../test/envers}/entities/ids/CustomEnum.java | 2 +- .../entities/ids/CustomEnumUserType.java | 2 +- .../test/envers}/entities/ids/DateEmbId.java | 2 +- .../entities/ids/DateIdTestEntity.java | 2 +- .../test/envers}/entities/ids/EmbId.java | 2 +- .../envers}/entities/ids/EmbIdTestEntity.java | 2 +- .../entities/ids/EmbIdWithCustomType.java | 2 +- .../ids/EmbIdWithCustomTypeTestEntity.java | 2 +- .../ids/ManyToOneIdNotAuditedTestEntity.java | 2 +- .../ids/ManyToOneNotAuditedEmbId.java | 4 +-- .../test/envers}/entities/ids/MulId.java | 2 +- .../envers}/entities/ids/MulIdTestEntity.java | 2 +- .../entities/ids/UnusualIdNamingEntity.java | 2 +- .../entities/manytomany/ListOwnedEntity.java | 2 +- .../entities/manytomany/ListOwningEntity.java | 2 +- .../entities/manytomany/MapOwnedEntity.java | 2 +- .../entities/manytomany/MapOwningEntity.java | 2 +- .../entities/manytomany/SetOwnedEntity.java | 2 +- .../entities/manytomany/SetOwningEntity.java | 2 +- .../entities/manytomany/SortedSetEntity.java | 6 ++-- .../manytomany/WhereJoinTableEntity.java | 4 +-- .../biowned/ListBiowning1Entity.java | 2 +- .../biowned/ListBiowning2Entity.java | 2 +- .../manytomany/sametable/Child1Entity.java | 2 +- .../manytomany/sametable/Child2Entity.java | 2 +- .../manytomany/sametable/ParentEntity.java | 2 +- .../unidirectional/JoinTableEntity.java | 4 +-- .../unidirectional/ListUniEntity.java | 4 +-- .../M2MIndexedListTargetNotAuditedEntity.java | 4 +-- .../M2MTargetNotAuditedEntity.java | 4 +-- .../ManyToManyNotAuditedNullEntity.java | 4 +-- .../unidirectional/MapUniEntity.java | 4 +-- .../unidirectional/SetUniEntity.java | 4 +-- .../ExtManyToOneNotAuditedNullEntity.java | 4 +-- .../ManyToOneNotAuditedNullEntity.java | 4 +-- .../TargetNotAuditedEntity.java | 4 +-- .../onetomany/CollectionRefEdEntity.java | 2 +- .../onetomany/CollectionRefIngEntity.java | 2 +- .../entities/onetomany/ListRefEdEntity.java | 2 +- .../entities/onetomany/ListRefIngEntity.java | 2 +- .../OneToManyNotAuditedNullEntity.java | 4 +-- .../entities/onetomany/SetRefEdEntity.java | 2 +- .../entities/onetomany/SetRefIngEntity.java | 2 +- ...stJoinColumnBidirectionalRefEdEntity1.java | 4 +-- ...stJoinColumnBidirectionalRefEdEntity2.java | 4 +-- ...stJoinColumnBidirectionalRefIngEntity.java | 4 +-- .../detached/DoubleSetRefCollEntity.java | 4 +-- ...istJoinColumnBidirectionalRefEdEntity.java | 4 +-- ...stJoinColumnBidirectionalRefIngEntity.java | 4 +-- ...irectionalInheritanceRefEdChildEntity.java | 4 +-- ...rectionalInheritanceRefEdParentEntity.java | 4 +-- ...nBidirectionalInheritanceRefIngEntity.java | 4 +-- ...istJoinColumnBidirectionalRefEdEntity.java | 4 +-- ...stJoinColumnBidirectionalRefIngEntity.java | 4 +-- .../onetomany/detached/ListRefCollEntity.java | 4 +-- .../detached/SetJoinColumnRefCollEntity.java | 4 +-- .../onetomany/detached/SetRefCollEntity.java | 4 +-- .../detached/ids/SetRefCollEntityEmbId.java | 6 ++-- .../detached/ids/SetRefCollEntityMulId.java | 6 ++-- ...stJoinColumnBidirectionalRefIngEntity.java | 5 +-- ...stJoinColumnBidirectionalRefIngEntity.java | 5 +-- ...istJoinColumnBidirectionalRefEdEntity.java | 5 +-- .../onetomany/ids/SetRefEdEmbIdEntity.java | 4 +-- .../onetomany/ids/SetRefEdMulIdEntity.java | 4 +-- .../onetomany/ids/SetRefIngEmbIdEntity.java | 4 +-- .../onetomany/ids/SetRefIngMulIdEntity.java | 4 +-- ...rectionalEagerAnnotationRefEdOneToOne.java | 2 +- ...ectionalEagerAnnotationRefIngOneToOne.java | 2 +- .../BidirectionalEagerHbmRefEdPK.java | 2 +- .../BidirectionalEagerHbmRefIngPK.java | 2 +- .../reventity/CustomDataRevEntity.java | 2 +- .../reventity/CustomDateRevEntity.java | 2 +- .../CustomPropertyAccessRevEntity.java | 2 +- .../entities/reventity/CustomRevEntity.java | 2 +- .../CustomRevEntityColumnMapping.java | 2 +- .../AnnotatedTrackingRevisionEntity.java | 2 +- .../CustomTrackingRevisionEntity.java | 2 +- .../CustomTrackingRevisionListener.java | 2 +- .../ExtendedRevisionEntity.java | 2 +- .../ExtendedRevisionListener.java | 2 +- .../ModifiedEntityTypeEntity.java | 2 +- .../accesstype/AttributeAccessorTest.java | 4 +-- .../integration/accesstype/Country.java | 2 +- .../accesstype/FieldAccessType.java | 6 ++-- .../accesstype/FieldAccessTypeEntity.java | 2 +- .../accesstype/ImmutableClassAccessType.java | 6 ++-- .../accesstype/MixedAccessType.java | 6 ++-- .../accesstype/MixedAccessTypeEntity.java | 2 +- .../accesstype/PropertyAccessType.java | 6 ++-- .../accesstype/PropertyAccessTypeEntity.java | 2 +- .../auditReader/AuditReaderAPITest.java | 6 ++-- .../auditReader/AuditedTestEntity.java | 2 +- .../FindByRevisionExactMatchOptionTest.java | 8 ++--- .../auditReader/NotAuditedTestEntity.java | 2 +- .../integration/basic/BasicTestEntity1.java | 2 +- .../integration/basic/BasicTestEntity2.java | 2 +- .../integration/basic/BasicTestEntity3.java | 2 +- .../integration/basic/BasicTestEntity4.java | 2 +- .../integration/basic/BigDecimalTypeTest.java | 6 ++-- .../envers}/integration/basic/Delete.java | 6 ++-- .../integration/basic/EmptyStringTest.java | 8 ++--- .../integration/basic/GlobalVersioned.java | 6 ++-- .../basic/ManyOperationsInTransaction.java | 6 ++-- .../integration/basic/NoneAudited.java | 4 +-- .../integration/basic/NotVersioned.java | 6 ++-- .../integration/basic/NullProperties.java | 6 ++-- .../basic/OutsideTransactionTest.java | 15 ++++---- .../basic/RegisterUserEventListenersTest.java | 6 ++-- .../basic/ScalePrecisionEntity.java | 2 +- .../envers}/integration/basic/Simple.java | 8 ++--- .../basic/SingleOperationInTransaction.java | 6 ++-- .../basic/TransactionRollbackBehaviour.java | 6 ++-- .../basic/UnversionedPropertiesChange.java | 6 ++-- .../basic/UnversionedProperty.java | 8 ++--- .../integration/cache/OneToManyCache.java | 10 +++--- .../integration/cache/OneToOneCache.java | 10 +++--- .../envers}/integration/cache/QueryCache.java | 8 ++--- .../collection/CollectionNullValueTest.java | 14 ++++---- .../DetachedCollectionChangeTest.java | 6 ++-- .../DetachedMultipleCollectionChangeTest.java | 15 ++++---- .../integration/collection/EmbeddableSet.java | 10 +++--- .../EntityMapCompositeElementTest.java | 6 ++-- .../integration/collection/EntityMapTest.java | 8 ++--- .../collection/IndexColumnListTest.java | 6 ++-- .../collection/OrderColumnListTest.java | 6 ++-- .../integration/collection/StringList.java | 10 +++--- .../integration/collection/StringMap.java | 10 +++--- .../collection/StringMapLobTest.java | 17 +++++---- .../integration/collection/StringSet.java | 10 +++--- .../embeddable/BasicEmbeddableCollection.java | 6 ++-- .../collection/embeddable/DarkCharacter.java | 2 +- .../embeddable/EmbeddableList1.java | 12 +++---- .../embeddable/EmbeddableList2.java | 12 +++---- .../embeddable/EmbeddableList3.java | 12 +++---- .../collection/embeddable/EmbeddableMap.java | 14 ++++---- .../collection/embeddable/EmbeddableSet.java | 14 ++++---- .../collection/embeddable/Item.java | 2 +- .../embeddable/ListEqualsHashCodeTest.java | 6 ++-- .../embeddable/ListNoEqualsHashCodeTest.java | 6 ++-- .../embeddable/MapEqualsHashCodeTest.java | 6 ++-- .../embeddable/MapNoEqualsHashCodeTest.java | 6 ++-- .../collection/embeddable/Name.java | 2 +- .../embeddable/NullPointerExceptionTest.java | 6 ++-- .../collection/embeddable/Product.java | 2 +- .../embeddable/SetEqualsHashCodeTest.java | 8 ++--- .../embeddable/SetNoEqualsHashCodeTest.java | 6 ++-- .../collection/embeddable/Type.java | 2 +- .../AbstractCollectionChangeTest.java | 6 ++-- .../collection/norevision/Child.java | 2 +- .../CollectionChangeNoRevisionTest.java | 2 +- .../CollectionChangeRevisionTest.java | 2 +- .../collection/norevision/House.java | 2 +- .../collection/norevision/Name.java | 2 +- .../collection/norevision/Parent.java | 2 +- .../collection/norevision/Person.java | 2 +- .../integration/components/Components.java | 12 +++---- .../components/DefaultValueComponents.java | 12 +++---- .../components/PropertiesGroupTest.java | 14 ++++---- .../collections/CollectionOfComponents.java | 10 +++--- .../mappedsuperclasselement/AbstractCode.java | 2 +- .../mappedsuperclasselement/Code.java | 2 +- ...ctionOfMappedSuperclassComponentsTest.java | 6 ++-- ...appedSuperclassComponentSetTestEntity.java | 2 +- .../components/dynamic/AdvancedEntity.java | 2 +- .../integration/components/dynamic/Age.java | 2 +- .../components/dynamic/AgeType.java | 2 +- .../AuditedDynamicComponentEntity.java | 2 +- .../components/dynamic/InternalComponent.java | 2 +- .../components/dynamic/ManyToManyEntity.java | 2 +- .../components/dynamic/ManyToOneEntity.java | 2 +- .../NotAuditedDynamicComponentTest.java | 6 ++-- .../NotAuditedDynamicMapComponent.java | 2 +- .../components/dynamic/OneToOneEntity.java | 2 +- .../components/dynamic/PlainComponent.java | 2 +- .../components/dynamic/PlainEntity.java | 2 +- .../components/dynamic/SanityCheckTest.java | 8 ++--- .../components/dynamic/SimpleEntity.java | 2 +- .../mappedsuperclass/AbstractEmbeddable.java | 2 +- .../EmbeddableWithDeclaredData.java | 2 +- .../EmbeddableWithDeclaredDataTest.java | 6 ++-- .../EmbeddableWithNoDeclaredData.java | 2 +- .../EmbeddableWithNoDeclaredDataTest.java | 6 ++-- .../EntityWithEmbeddableWithDeclaredData.java | 2 +- ...ntityWithEmbeddableWithNoDeclaredData.java | 2 +- .../relations/ManyToOneInComponent.java | 12 +++---- .../NotAuditedManyToOneInComponent.java | 12 +++---- .../relations/OneToManyInComponent.java | 12 +++---- .../dynamicmodel/DynamicModelTest.java | 4 +-- .../entityNames/auditedEntity/Person.java | 2 +- .../ReadEntityWhitEntityNameTest.java | 6 ++-- .../entityNames/manyToManyAudited/Car.java | 2 +- .../entityNames/manyToManyAudited/Person.java | 2 +- .../ReadEntityWithAuditedManyToManyTest.java | 6 ++-- .../entityNames/oneToManyAudited/Car.java | 2 +- .../entityNames/oneToManyAudited/Person.java | 2 +- .../ReadEntityWithAuditedCollectionTest.java | 6 ++-- .../entityNames/oneToManyNotAudited/Car.java | 2 +- .../oneToManyNotAudited/Person.java | 2 +- .../ReadEntityWithAuditedCollectionTest.java | 6 ++-- .../singleAssociatedAudited/Car.java | 2 +- .../singleAssociatedAudited/Person.java | 2 +- .../ReadEntityAssociatedAuditedTest.java | 6 ++-- ...ingleDomainObjectToMultipleTablesTest.java | 6 ++-- .../singleAssociatedNotAudited/Car.java | 2 +- .../singleAssociatedNotAudited/Person.java | 2 +- .../ReadEntityAssociatedNotAuditedTest.java | 6 ++-- .../integration/flush/AbstractFlushTest.java | 6 ++-- .../integration/flush/CommitFlush.java | 6 ++-- .../flush/CommitFlushCollectionTest.java | 6 ++-- ...ommitFlushSingleRevisionInTransaction.java | 4 +-- .../integration/flush/DoubleFlushAddDel.java | 6 ++-- .../integration/flush/DoubleFlushAddMod.java | 6 ++-- .../integration/flush/DoubleFlushModDel.java | 6 ++-- .../integration/flush/DoubleFlushModMod.java | 6 ++-- .../integration/flush/ManualFlush.java | 6 ++-- .../flush/ManualFlushAutoCommitDisabled.java | 2 +- .../hashcode/ChangingHashcode.java | 8 ++--- ...ComponentCollectionHashcodeChangeTest.java | 8 ++--- .../hashcode/ListHashcodeChangeTest.java | 7 ++-- .../hashcode/SetHashcodeChangeTest.java | 6 ++-- .../integration/hashcode/WikiImage.java | 2 +- .../integration/hashcode/WikiPage.java | 2 +- .../integration/ids/CompositeDateId.java | 10 +++--- .../test/envers}/integration/ids/DateId.java | 8 ++--- .../ids/ManyToOneIdNotAudited.java | 14 ++++---- .../ids/embeddedid/CorrectChild.java | 2 +- .../ids/embeddedid/CorrectChildId.java | 2 +- .../ids/embeddedid/IncorrectChild.java | 2 +- .../ids/embeddedid/IncorrectChildId.java | 2 +- .../integration/ids/embeddedid/Item.java | 2 +- .../integration/ids/embeddedid/ItemId.java | 2 +- .../integration/ids/embeddedid/Parent.java | 2 +- .../integration/ids/embeddedid/Producer.java | 2 +- .../ids/embeddedid/PurchaseOrder.java | 2 +- .../RelationInsideEmbeddableRemoveTest.java | 6 ++-- .../integration/ids/idclass/ClassType.java | 2 +- .../IdClassReferenceIdentifierTest.java | 6 ++-- .../IntegerGeneratedIdentityEntity.java | 2 +- .../idclass/ReferenceIdentifierClassId.java | 2 +- .../idclass/ReferenceIdentifierEntity.java | 2 +- .../ids/idclass/RelationalClassId.java | 2 +- .../integration/ids/idclass/SampleClass.java | 2 +- .../ProtectedConstructorEntity.java | 2 +- .../ProtectedConstructorTest.java | 6 ++-- .../protectedmodifier/WrappedStringId.java | 2 +- .../inheritance/single/ChildAuditing.java | 6 ++-- .../inheritance/single/ChildEntity.java | 2 +- .../inheritance/single/ParentAuditing.java | 6 ++-- .../inheritance/single/ParentEntity.java | 2 +- .../single/childrelation/ChildIngEntity.java | 2 +- .../childrelation/ChildReferencing.java | 8 ++--- .../childrelation/ParentNotIngEntity.java | 2 +- .../childrelation/ReferencedEntity.java | 2 +- .../discriminatorformula/ChildEntity.java | 2 +- .../discriminatorformula/ClassTypeEntity.java | 2 +- .../DiscriminatorFormulaTest.java | 8 ++--- .../discriminatorformula/ParentEntity.java | 2 +- .../single/notownedrelation/Address.java | 2 +- .../single/notownedrelation/Contact.java | 2 +- .../NotOwnedBidirectional.java | 8 ++--- .../notownedrelation/PersonalContact.java | 2 +- .../single/relation/ChildIngEntity.java | 2 +- .../single/relation/ParentIngEntity.java | 2 +- .../relation/PolymorphicCollection.java | 8 ++--- .../relation/PolymorphicRemovalTest.java | 6 ++-- .../single/relation/ReferencedEntity.java | 2 +- .../tableperclass/ChildAuditing.java | 6 ++-- .../tableperclass/ChildEntity.java | 2 +- .../tableperclass/ParentAuditing.java | 6 ++-- .../tableperclass/ParentEntity.java | 2 +- .../abstractparent/AbstractEntity.java | 2 +- .../AuditedAbstractParentTest.java | 7 ++-- .../abstractparent/EffectiveEntity1.java | 2 +- .../notownedrelation/Address.java | 2 +- .../notownedrelation/Contact.java | 2 +- .../NotOwnedBidirectional.java | 8 ++--- .../notownedrelation/PersonalContact.java | 2 +- .../relation/ChildIngEntity.java | 2 +- .../relation/ParentIngEntity.java | 2 +- .../relation/PolymorphicCollection.java | 8 ++--- .../relation/ReferencedEntity.java | 2 +- .../interfaces/components/Component1.java | 2 +- .../components/ComponentTestEntity.java | 2 +- .../interfaces/components/IComponent.java | 2 +- .../components/InterfacesComponents.java | 6 ++-- .../allAudited/AbstractAllAuditedTest.java | 6 ++-- .../hbm/allAudited/AuditedImplementor.java | 3 +- .../hbm/allAudited/NonAuditedImplementor.java | 4 ++- .../hbm/allAudited/SimpleInterface.java | 2 +- .../subclass/SubclassAllAuditedTest.java | 4 +-- .../allAudited/union/UnionAllAuditedTest.java | 4 +-- .../AbstractPropertiesAuditedTest.java | 6 ++-- .../propertiesAudited/AuditedImplementor.java | 2 +- .../NonAuditedImplementor.java | 2 +- .../propertiesAudited/SimpleInterface.java | 2 +- .../joined/JoinedPropertiesAuditedTest.java | 4 +-- .../SubclassPropertiesAuditedTest.java | 4 +-- .../union/UnionPropertiesAuditedTest.java | 4 +-- .../AbstractPropertiesAudited2Test.java | 6 ++-- .../AuditedImplementor.java | 2 +- .../NonAuditedImplementor.java | 2 +- .../propertiesAudited2/SimpleInterface.java | 2 +- .../joined/JoinedPropertiesAudited2Test.java | 4 +-- .../SubclassPropertiesAudited2Test.java | 4 +-- .../union/UnionPropertiesAudited2Test.java | 4 +-- .../interfaces/relation/ISetRefEdEntity.java | 2 +- .../relation/InterfacesRelation.java | 6 ++-- .../interfaces/relation/SetRefEdEntity.java | 2 +- .../interfaces/relation/SetRefIngEntity.java | 2 +- ...ctionJtaSessionClosedBeforeCommitTest.java | 7 ++-- ...ProxyJtaSessionClosedBeforeCommitTest.java | 6 ++-- .../integration/jta/JtaExceptionListener.java | 12 +++---- .../jta/JtaSessionClosedBeforeCommitTest.java | 8 ++--- .../integration/jta/JtaTransaction.java | 10 +++--- .../jta/JtaTransactionAfterCallbackTest.java | 8 ++--- ...oManyJtaSessionClosedBeforeCommitTest.java | 10 +++--- .../integration/manytomany/BasicList.java | 12 +++---- .../integration/manytomany/BasicMap.java | 12 +++---- .../integration/manytomany/BasicSet.java | 12 +++---- .../CustomComparatorEntityTest.java | 12 +++---- .../manytomany/IndexColumnListTest.java | 6 ++-- .../MappedByEmbeddableAttributeTest.java | 6 ++-- .../manytomany/OrderColumnListTest.java | 6 ++-- .../manytomany/biowned/BasicBiowned.java | 12 +++---- .../inverseToSuperclass/DetailSubclass.java | 2 +- .../inverseToSuperclass/DetailSubclass2.java | 2 +- .../inverseToSuperclass/DetailSuperclass.java | 2 +- .../ManyToManyInverseToSuperclassTest.java | 6 ++-- .../manytomany}/inverseToSuperclass/Root.java | 2 +- .../manytomany/sametable/BasicSametable.java | 14 ++++---- .../manytomany/ternary/TernaryMap.java | 12 +++---- .../manytomany/ternary/TernaryMapEntity.java | 6 ++-- .../manytomany/ternary/TernaryMapFlush.java | 12 +++---- .../unidirectional/BasicUniList.java | 12 +++---- .../unidirectional/BasicUniMap.java | 12 +++---- .../unidirectional/BasicUniSet.java | 12 +++---- .../unidirectional/JoinTableDetachedTest.java | 10 +++--- .../M2MIndexedListNotAuditedTarget.java | 12 +++---- .../M2MRelationNotAuditedTarget.java | 12 +++---- .../manytoone/DetachedUpdateTest.java | 6 ++-- .../EmbeddedIdManyToOneForeignKeyTest.java | 5 ++- .../RelationNotAuditedTarget.java | 10 +++--- .../envers}/integration/merge/AddDelTest.java | 8 ++--- .../integration/merge/GivenIdStrEntity.java | 2 +- .../AbstractModifiedFlagsEntityTest.java | 4 +-- .../AbstractModifiedFlagsOneSessionTest.java | 4 +-- .../modifiedflags/DetachedEntityTest.java | 6 ++-- ...asChangedAuditedManyToManyRemovalTest.java | 10 +++--- .../HasChangedAuditedManyToManyTest.java | 12 +++---- .../HasChangedBidirectionalTest.java | 6 ++-- .../HasChangedComponentCollection.java | 14 ++++---- .../HasChangedComponentMapKey.java | 14 ++++---- .../modifiedflags/HasChangedComponents.java | 18 +++++----- .../HasChangedDetachedMultipleCollection.java | 18 +++++----- ...ngedDoubleJoinColumnBidirectionalList.java | 14 ++++---- .../modifiedflags/HasChangedIdMapKey.java | 10 +++--- ...hangedInsertUpdateSameTransactionTest.java | 6 ++-- .../modifiedflags/HasChangedManualFlush.java | 10 +++--- .../HasChangedManyToOneInComponent.java | 14 ++++---- .../modifiedflags/HasChangedMergeTest.java | 12 +++---- .../HasChangedNullProperties.java | 10 +++--- .../HasChangedOneToManyInComponent.java | 14 ++++---- .../modifiedflags/HasChangedStringMap.java | 10 +++--- .../modifiedflags/HasChangedStringSet.java | 10 +++--- .../HasChangedUnversionedProperties.java | 10 +++--- .../modifiedflags/ModifiedFlagSuffix.java | 14 ++++---- .../modifiedflags/entities/EnumEntity.java | 2 +- .../modifiedflags/entities/EnumOption.java | 2 +- .../entities/PartialModifiedFlagsEntity.java | 8 ++--- .../modifiedflags/entities/Professor.java | 2 +- .../modifiedflags/entities/Student.java | 2 +- .../WithModifiedFlagReferencingEntity.java | 2 +- .../multiplerelations/Address.java | 2 +- .../multiplerelations/GroupMemberTest.java | 7 ++-- .../MultipleAssociationsTest.java | 8 ++--- .../integration/multiplerelations/Person.java | 2 +- .../integration/naming/BasicNaming.java | 8 ++--- .../naming/DetachedNamingTestEntity.java | 4 +-- .../naming/EstonianTableAlias.java | 8 ++--- .../integration/naming/JoinNaming.java | 9 +++-- .../naming/JoinNamingRefEdEntity.java | 2 +- .../naming/JoinNamingRefIngEntity.java | 2 +- .../integration/naming/NamingTestEntity1.java | 2 +- .../integration/naming/NamingTestEntity2.java | 2 +- .../naming/OneToManyUnidirectionalNaming.java | 10 +++--- .../naming/VersionsJoinTableNaming.java | 10 +++--- .../VersionsJoinTableRangeComponent.java | 4 +-- ...ionsJoinTableRangeComponentTestEntity.java | 4 +-- ...ionsJoinTableRangeTestAlternateEntity.java | 2 +- .../VersionsJoinTableRangeTestEntity.java | 2 +- ...onsJoinTableRangeTestEntitySuperClass.java | 2 +- .../naming/VersionsJoinTableTestEntity.java | 4 +-- .../integration/naming/ids/EmbIdNaming.java | 2 +- .../naming/ids/JoinEmbIdNaming.java | 11 +++--- .../ids/JoinEmbIdNamingRefEdEntity.java | 2 +- .../ids/JoinEmbIdNamingRefIngEntity.java | 2 +- .../naming/ids/JoinMulIdNaming.java | 11 +++--- .../ids/JoinMulIdNamingRefEdEntity.java | 2 +- .../ids/JoinMulIdNamingRefIngEntity.java | 2 +- .../integration/naming/ids/MulIdNaming.java | 2 +- .../naming/quotation/QuotedFieldsEntity.java | 2 +- .../naming/quotation/QuotedFieldsTest.java | 8 ++--- .../notinsertable/NotInsertable.java | 6 ++-- .../NotInsertableTestEntity.java | 2 +- .../manytoone/ManyToOneNotInsertable.java | 6 ++-- .../ManyToOneNotInsertableEntity.java | 2 +- .../manytoone/NotInsertableEntityType.java | 2 +- .../onetomany/BasicCollection.java | 10 +++--- .../integration/onetomany/BasicList.java | 12 +++---- .../integration/onetomany/BasicSet.java | 12 +++---- .../onetomany/BasicSetWithEmbId.java | 12 +++---- .../onetomany/BasicSetWithMulId.java | 12 +++---- .../onetomany/BasicSetWithNullsDelete.java | 10 +++--- .../onetomany/BidirectionalMapKey.java | 8 ++--- .../onetomany/IndexColumnListTest.java | 6 ++-- .../onetomany/InverseSideChanges.java | 10 +++--- .../onetomany/OrderColumnListTest.java | 6 ++-- .../onetomany/RefEdMapKeyEntity.java | 2 +- .../onetomany/RefIngMapKeyEntity.java | 2 +- .../onetomany/detached/BasicDetachedList.java | 12 +++---- .../onetomany/detached/BasicDetachedSet.java | 12 +++---- .../detached/BasicDetachedSetWithEmbId.java | 14 ++++---- .../detached/BasicDetachedSetWithMulId.java | 14 ++++---- .../detached/BasicJoinColumnSet.java | 12 +++---- .../detached/DataChangesDetachedSet.java | 12 +++---- .../onetomany/detached/DetachedTest.java | 10 +++--- .../onetomany/detached/DoubleDetachedSet.java | 12 +++---- .../DoubleJoinColumnBidirectionalList.java | 14 ++++---- .../IndexedJoinColumnBidirectionalList.java | 10 +++--- .../detached/JoinColumnBidirectionalList.java | 12 +++---- ...olumnBidirectionalListWithInheritance.java | 14 ++++---- .../onetomany/embeddedid/Constant.java | 2 +- .../embeddedid/OneToManyCompositeKeyTest.java | 4 +-- .../onetomany/embeddedid/Person.java | 2 +- .../onetomany/embeddedid/PersonTuple.java | 2 +- .../idclass/ManyToManyCompositeKey.java | 2 +- .../onetomany/idclass/ManyToOneOwned.java | 2 +- .../onetomany/idclass/OneToManyOwned.java | 2 +- .../inverseToSuperclass/DetailSubclass.java | 2 +- .../inverseToSuperclass/DetailSubclass2.java | 2 +- .../inverseToSuperclass/DetailSuperclass.java | 2 +- .../OneToManyInverseToSuperclassTest.java | 6 ++-- .../onetomany}/inverseToSuperclass/Root.java | 2 +- .../relatedid/AuditRelatedIdInTest.java | 8 ++--- .../onetomany/relatedid/Company.java | 2 +- .../onetomany/relatedid/Employee.java | 2 +- .../onetoone/bidirectional/BiRefEdEntity.java | 2 +- .../bidirectional/BiRefIngEntity.java | 2 +- .../bidirectional/BiRefedOptionalEntity.java | 2 +- .../bidirectional/BiRefingOptionalEntity.java | 2 +- .../onetoone/bidirectional/Bidirectional.java | 6 ++-- .../bidirectional/Bidirectional2.java | 6 ++-- .../BidirectionalEagerAnnotationTest.java | 10 +++--- .../BidirectionalEagerHbmTest.java | 10 +++--- .../bidirectional/BidirectionalNoNulls.java | 6 ++-- .../bidirectional/ids/BiEmbIdRefEdEntity.java | 4 +-- .../ids/BiEmbIdRefIngEntity.java | 4 +-- .../bidirectional/ids/BiMulIdRefEdEntity.java | 4 +-- .../ids/BiMulIdRefIngEntity.java | 4 +-- .../bidirectional/ids/EmbIdBidirectional.java | 8 ++--- .../bidirectional/ids/MulIdBidirectional.java | 8 ++--- .../primarykeyjoincolumn/Account.java | 2 +- .../AccountNotAuditedOwners.java | 2 +- .../NotAuditedNoProxyPerson.java | 2 +- .../NotAuditedProxyPerson.java | 2 +- .../OneToOneWithPrimaryKeyJoinTest.java | 6 ++-- .../primarykeyjoincolumn/Person.java | 2 +- .../unidirectional/UniRefEdEntity.java | 2 +- .../unidirectional/UniRefIngEntity.java | 2 +- .../unidirectional/UniRefIngMulIdEntity.java | 4 +-- .../unidirectional/Unidirectional.java | 6 ++-- .../UnidirectionalMulIdWithNulls.java | 10 +++--- .../UnidirectionalWithNulls.java | 6 ++-- .../primitive/PrimitiveAddDelete.java | 8 ++--- .../properties/PropertiesTestEntity.java | 2 +- .../UnversionedOptimisticLockingField.java | 6 ++-- ...versionedOptimisticLockingFieldEntity.java | 2 +- .../properties/VersionsProperties.java | 6 ++-- .../proxy/AuditedCollectionProxyTest.java | 10 +++--- .../integration/proxy/ProxyIdentifier.java | 18 +++++----- .../proxy/QueryingWithProxyObjectTest.java | 8 ++--- .../proxy/RemovedObjectQueryTest.java | 36 +++++++++---------- .../AbstractEntityWithChangesQueryTest.java | 8 ++--- .../integration/query/AggregateQuery.java | 12 +++---- .../AssociationEntitiesModifiedQueryTest.java | 6 ++-- .../AssociationToOneLeftJoinQueryTest.java | 12 +++---- .../query/CustomRevEntityQuery.java | 10 +++--- .../integration/query/DeletedEntities.java | 8 ++--- ...ityWithChangesQueryNoModifiedFlagTest.java | 2 +- ...WithChangesQueryStoreDeletionDataTest.java | 2 +- .../query/EntityWithChangesQueryTest.java | 2 +- .../JoinedInheritancePropertyJoinTest.java | 6 ++-- .../query/MaximalizePropertyQuery.java | 8 ++--- .../query/NotAuditedQueryTest.java | 4 +-- .../integration/query/NullPropertyQuery.java | 18 +++++----- .../query/RevisionConstraintQuery.java | 10 +++--- .../integration/query/SimpleQuery.java | 18 +++++----- .../integration/query/StoreDeletedData.java | 8 ++--- .../query/embeddables/EmbeddableQuery.java | 6 ++-- .../query/embeddables/NameInfo.java | 2 +- .../integration/query/embeddables/Person.java | 2 +- .../integration/query/entities/Address.java | 2 +- .../integration/query/entities/Car.java | 2 +- .../integration/query/entities/Person.java | 2 +- .../reference/BidirectionalReference.java | 8 ++--- .../integration/reference/GreetingPO.java | 2 +- .../integration/reference/GreetingSetPO.java | 2 +- .../reventity/CountingRevisionListener.java | 2 +- .../envers}/integration/reventity/Custom.java | 10 +++--- .../integration/reventity/CustomBoxed.java | 8 ++--- .../reventity/CustomBoxedRevEntity.java | 2 +- .../reventity/CustomColumnMapping.java | 10 +++--- .../integration/reventity/CustomDate.java | 10 +++--- .../reventity/CustomNoListener.java | 10 +++--- .../reventity/CustomPropertyAccess.java | 10 +++--- .../reventity/DifferentDBSchemaTest.java | 8 ++--- .../reventity/ExceptionListener.java | 6 ++-- .../reventity/ExceptionListenerRevEntity.java | 2 +- .../GloballyConfiguredRevListenerTest.java | 8 ++--- .../integration/reventity/Inherited.java | 8 ++--- .../reventity/InheritedRevEntity.java | 2 +- .../integration/reventity/Listener.java | 8 ++--- .../reventity/ListenerRevEntity.java | 2 +- .../integration/reventity/LongRevNumber.java | 8 ++--- .../reventity/LongRevNumberRevEntity.java | 2 +- .../MonotonicRevisionNumberTest.java | 6 ++-- .../OverrideCustomRevListenerTest.java | 2 +- .../OverrideDefaultRevListenerTest.java | 2 +- .../reventity/RevisionNumberOverflowTest.java | 8 ++--- .../TestExceptionRevisionListener.java | 2 +- .../reventity/TestRevisionListener.java | 2 +- .../AbstractRevisionEntityRemovalTest.java | 12 +++---- .../removal/RemoveDefaultRevisionEntity.java | 2 +- .../removal/RemoveTrackingRevisionEntity.java | 2 +- .../AnnotatedTrackingEntitiesTest.java | 4 +-- .../CustomTrackingEntitiesTest.java | 18 +++++----- .../DefaultTrackingEntitiesTest.java | 13 ++++--- .../EntityNamesTest.java | 12 +++---- .../ExtendedRevisionEntityTest.java | 6 ++-- .../TrackingEntitiesMultipleChangesTest.java | 10 +++--- .../revfordate/RevisionForDate.java | 8 ++--- .../sameids/SameIdTestEntity1.java | 2 +- .../sameids/SameIdTestEntity2.java | 2 +- .../envers}/integration/sameids/SameIds.java | 6 ++-- .../serialization/SerializingCollection.java | 10 +++--- .../strategy/IdentifierReuseTest.java | 6 ++-- ...StrategyComponentCollectionRevEndTest.java | 6 ++-- .../ValidityAuditStrategyManyToManyTest.java | 10 +++--- ...tyAuditStrategyRevEndTestCustomRevEnt.java | 18 +++++----- .../ValidityAuditStrategyRevEndTsTest.java | 16 ++++----- .../AuditedMethodMappedSuperclass.java | 2 +- .../NotAuditedSubclassEntity.java | 2 +- .../AuditedAllSubclassEntity.java | 4 +-- .../MappedSubclassingAllAuditedTest.java | 10 +++--- .../AuditedMethodSubclassEntity.java | 4 +-- .../MappedSubclassingMethodAuditedTest.java | 10 +++--- .../AuditedAllMappedSuperclass.java | 2 +- .../NotAuditedSubclassEntity.java | 2 +- .../AuditedAllSubclassEntity.java | 4 +-- .../MappedSubclassingAllAuditedTest.java | 10 +++--- .../AuditedMethodSubclassEntity.java | 4 +-- .../MappedSubclassingMethodAuditedTest.java | 10 +++--- .../auditoverride/AuditClassOverrideTest.java | 10 +++--- .../AuditOverrideAuditJoinTableTest.java | 8 ++--- .../AuditPropertyOverrideTest.java | 12 +++---- .../auditoverride/AuditedBaseEntity.java | 2 +- .../auditoverride/AuditedSpecialEntity.java | 2 +- .../superclass/auditoverride/BaseEntity.java | 2 +- .../ClassOverrideAuditedEntity.java | 2 +- .../ClassOverrideNotAuditedEntity.java | 2 +- .../auditoverride/ExtendedBaseEntity.java | 2 +- .../auditoverride/MixedOverrideEntity.java | 2 +- .../auditoverride/MixedOverrideTest.java | 8 ++--- .../auditoverride/NotAuditedBaseEntity.java | 2 +- .../auditoverride/PropertyOverrideEntity.java | 2 +- .../TransitiveOverrideEntity.java | 2 +- .../auditparents/BabyCompleteEntity.java | 4 +-- .../auditparents/ChildCompleteEntity.java | 4 +-- .../ChildMultipleParentsEntity.java | 4 +-- .../auditparents/ChildSingleParentEntity.java | 4 +-- .../ExplicitTransitiveChildEntity.java | 2 +- .../ImplicitTransitiveChildEntity.java | 2 +- .../auditparents/MappedGrandparentEntity.java | 2 +- .../auditparents/MappedParentEntity.java | 4 +-- .../MultipleAuditParentsTest.java | 12 +++---- .../auditparents/SingleAuditParentsTest.java | 12 +++---- .../auditparents/TotalAuditParentsTest.java | 12 +++---- .../TransitiveAuditParentsTest.java | 12 +++---- .../auditparents/TransitiveParentEntity.java | 2 +- .../tools/OrderSequenceGenerationTest.java | 8 ++--- .../integration/tools/SchemaExportTest.java | 8 ++--- .../update/SelectBeforeUpdateTest.java | 6 ++-- .../integrator/BasicIntegratorTest.java | 2 +- .../AbstractEntityManagerTest.java | 4 +-- .../performance/AbstractPerformanceTest.java | 2 +- .../envers}/performance/AllPerformance.java | 2 +- .../performance/ComplexInsertPerformance.java | 8 ++--- .../EvictAuditDataAfterCommitTest.java | 16 ++++----- .../InsertsOneTransactionPerformance.java | 4 +-- .../performance/InsertsPerformance.java | 4 +-- .../performance/UpdatesPerformance.java | 4 +-- .../performance/complex/ChildEntity1.java | 2 +- .../performance/complex/ChildEntity2.java | 2 +- .../performance/complex/RootEntity.java | 2 +- .../test/envers}/tools/TablePrinter.java | 2 +- .../test/envers}/tools/TestTools.java | 2 +- .../test/envers}/various/Address.java | 2 +- .../envers}/various/ExportIdentifierTest.java | 2 +- .../test/envers}/various/HsqlTest.java | 2 +- .../test/envers}/various/Person.java | 2 +- .../mappings/collections/Category.hbm.xml | 8 ++--- .../mappings/collections/Item.hbm.xml | 2 +- .../components/UniquePropsEntity.hbm.xml | 2 +- .../UniquePropsNotAuditedEntity.hbm.xml | 2 +- .../mappings/customType/mappings.hbm.xml | 6 ++-- .../dynamicComponents/mapAdvanced.hbm.xml | 24 ++++++------- .../dynamicComponents/mapAudited.hbm.xml | 6 ++-- .../dynamicComponents/mapNotAudited.hbm.xml | 2 +- .../dynamicComponents/mapSanityCheck.hbm.xml | 20 +++++------ .../auditedEntity/mappings.hbm.xml | 2 +- .../manyToManyAudited/mappings.hbm.xml | 6 ++-- .../oneToManyAudited/mappings.hbm.xml | 8 ++--- .../oneToManyNotAudited/mappings.hbm.xml | 4 +-- .../singleAssociatedAudited/mappings.hbm.xml | 6 ++-- .../mappings.hbm.xml | 4 +-- .../joinedAllAuditedMappings.hbm.xml | 10 +++--- .../joinedPropertiesAudited2Mappings.hbm.xml | 10 +++--- .../joinedPropertiesAuditedMappings.hbm.xml | 10 +++--- .../subclassAllAuditedMappings.hbm.xml | 10 +++--- ...subclassPropertiesAudited2Mappings.hbm.xml | 10 +++--- .../subclassPropertiesAuditedMappings.hbm.xml | 10 +++--- .../unionAllAuditedMappings.hbm.xml | 10 +++--- .../unionPropertiesAudited2Mappings.hbm.xml | 10 +++--- .../unionPropertiesAuditedMappings.hbm.xml | 10 +++--- .../inverseToSuperclass/mappings.hbm.xml | 14 ++++---- .../inverseToSuperclass/mappings.hbm.xml | 14 ++++---- .../bidirectional/eagerLoading.hbm.xml | 2 +- .../ClassicQueryTranslatorFactoryTest.java | 2 +- 791 files changed, 2124 insertions(+), 2101 deletions(-) rename hibernate-envers/src/test/java/org/hibernate/envers/test/integration/{components => }/dynamic/AuditedDynamicComponentsAdvancedCasesTest.java (93%) rename hibernate-envers/src/test/java/org/hibernate/envers/test/integration/{interfaces => }/hbm/allAudited/joined/JoinedAllAuditedTest.java (73%) rename hibernate-envers/src/test/java/org/hibernate/envers/test/integration/{manytomany => maytomany}/BasicWhereJoinTable.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/AbstractEnversTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/AbstractOneSessionTest.java (98%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/BaseEnversFunctionalTestCase.java (98%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/BaseEnversJPAFunctionalTestCase.java (98%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/EnversRunner.java (99%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/JpaStaticMetamodelTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/Priority.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/IntNoAutoIdTestEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/IntTestEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/IntTestPrivSeqEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/PrimitiveTestEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/StrIntTestEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/StrTestEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/StrTestEntityComparator.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/StrTestNoProxyEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/StrTestPrivSeqEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/UnversionedEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/UnversionedStrTestEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/collection/EmbeddableListEntity1.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/collection/EmbeddableListEntity2.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/collection/EmbeddableListEntity3.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/collection/EmbeddableMapEntity.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/collection/EmbeddableSetEntity.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/collection/EnumMapEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/collection/EnumMapType.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/collection/EnumSetEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/collection/MultipleCollectionEntity.java (98%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/collection/MultipleCollectionRefEntity1.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/collection/MultipleCollectionRefEntity2.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/collection/StringListEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/collection/StringMapEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/collection/StringSetEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/components/Component1.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/components/Component2.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/components/Component3.java (98%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/components/Component4.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/components/ComponentSetTestEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/components/ComponentTestEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/components/DefaultValueComponent1.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/components/DefaultValueComponent2.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/components/DefaultValueComponentTestEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/components/UniquePropsEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/components/UniquePropsNotAuditedEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/components/relations/ManyToOneComponent.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/components/relations/ManyToOneComponentTestEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/components/relations/ManyToOneEagerComponent.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/components/relations/NotAuditedManyToOneComponent.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/components/relations/NotAuditedManyToOneComponentTestEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/components/relations/OneToManyComponent.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/components/relations/OneToManyComponentTestEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/converter/BasicModelingTest.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/converter/Person.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/converter/Sex.java (84%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/converter/SexConverter.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/customtype/Component.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/customtype/EnumTypeEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/customtype/ParametrizedCustomTypeEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/customtype/ParametrizedTestUserType.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/customtype/UnspecifiedEnumTypeEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/ids/CompositeDateIdTestEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/ids/CustomEnum.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/ids/CustomEnumUserType.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/ids/DateEmbId.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/ids/DateIdTestEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/ids/EmbId.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/ids/EmbIdTestEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/ids/EmbIdWithCustomType.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/ids/EmbIdWithCustomTypeTestEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/ids/ManyToOneIdNotAuditedTestEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/ids/ManyToOneNotAuditedEmbId.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/ids/MulId.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/ids/MulIdTestEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/ids/UnusualIdNamingEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytomany/ListOwnedEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytomany/ListOwningEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytomany/MapOwnedEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytomany/MapOwningEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytomany/SetOwnedEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytomany/SetOwningEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytomany/SortedSetEntity.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytomany/WhereJoinTableEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytomany/biowned/ListBiowning1Entity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytomany/biowned/ListBiowning2Entity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytomany/sametable/Child1Entity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytomany/sametable/Child2Entity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytomany/sametable/ParentEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytomany/unidirectional/JoinTableEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytomany/unidirectional/ListUniEntity.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytomany/unidirectional/M2MIndexedListTargetNotAuditedEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytomany/unidirectional/M2MTargetNotAuditedEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytomany/unidirectional/ManyToManyNotAuditedNullEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytomany/unidirectional/MapUniEntity.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytomany/unidirectional/SetUniEntity.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytoone/unidirectional/ExtManyToOneNotAuditedNullEntity.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytoone/unidirectional/ManyToOneNotAuditedNullEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/manytoone/unidirectional/TargetNotAuditedEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/CollectionRefEdEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/CollectionRefIngEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/ListRefEdEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/ListRefIngEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/OneToManyNotAuditedNullEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/SetRefEdEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/SetRefIngEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity1.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity2.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefIngEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/detached/DoubleSetRefCollEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefEdEntity.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefIngEntity.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdChildEntity.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdParentEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefIngEntity.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/detached/ListJoinColumnBidirectionalRefEdEntity.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/detached/ListJoinColumnBidirectionalRefIngEntity.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/detached/ListRefCollEntity.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/detached/SetJoinColumnRefCollEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/detached/SetRefCollEntity.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/detached/ids/SetRefCollEntityMulId.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/detached/inheritance/ChildIndexedListJoinColumnBidirectionalRefIngEntity.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/detached/inheritance/ParentIndexedListJoinColumnBidirectionalRefIngEntity.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/detached/inheritance/ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/ids/SetRefEdEmbIdEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/ids/SetRefEdMulIdEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/ids/SetRefIngEmbIdEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetomany/ids/SetRefIngMulIdEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetoone/BidirectionalEagerAnnotationRefEdOneToOne.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetoone/BidirectionalEagerAnnotationRefIngOneToOne.java (98%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetoone/BidirectionalEagerHbmRefEdPK.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/onetoone/BidirectionalEagerHbmRefIngPK.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/reventity/CustomDataRevEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/reventity/CustomDateRevEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/reventity/CustomPropertyAccessRevEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/reventity/CustomRevEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/reventity/CustomRevEntityColumnMapping.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/reventity/trackmodifiedentities/AnnotatedTrackingRevisionEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/reventity/trackmodifiedentities/CustomTrackingRevisionEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/reventity/trackmodifiedentities/CustomTrackingRevisionListener.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/reventity/trackmodifiedentities/ExtendedRevisionListener.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/entities/reventity/trackmodifiedentities/ModifiedEntityTypeEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/accesstype/AttributeAccessorTest.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/accesstype/Country.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/accesstype/FieldAccessType.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/accesstype/FieldAccessTypeEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/accesstype/ImmutableClassAccessType.java (87%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/accesstype/MixedAccessType.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/accesstype/MixedAccessTypeEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/accesstype/PropertyAccessType.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/accesstype/PropertyAccessTypeEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/auditReader/AuditReaderAPITest.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/auditReader/AuditedTestEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/auditReader/FindByRevisionExactMatchOptionTest.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/auditReader/NotAuditedTestEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/basic/BasicTestEntity1.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/basic/BasicTestEntity2.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/basic/BasicTestEntity3.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/basic/BasicTestEntity4.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/basic/BigDecimalTypeTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/basic/Delete.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/basic/EmptyStringTest.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/basic/GlobalVersioned.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/basic/ManyOperationsInTransaction.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/basic/NoneAudited.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/basic/NotVersioned.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/basic/NullProperties.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/basic/OutsideTransactionTest.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/basic/RegisterUserEventListenersTest.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/basic/ScalePrecisionEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/basic/Simple.java (86%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/basic/SingleOperationInTransaction.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/basic/TransactionRollbackBehaviour.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/basic/UnversionedPropertiesChange.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/basic/UnversionedProperty.java (86%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/cache/OneToManyCache.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/cache/OneToOneCache.java (85%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/cache/QueryCache.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/CollectionNullValueTest.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/DetachedCollectionChangeTest.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/DetachedMultipleCollectionChangeTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/EmbeddableSet.java (83%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/EntityMapCompositeElementTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/EntityMapTest.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/IndexColumnListTest.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/OrderColumnListTest.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/StringList.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/StringMap.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/StringMapLobTest.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/StringSet.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/embeddable/BasicEmbeddableCollection.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/embeddable/DarkCharacter.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/embeddable/EmbeddableList1.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/embeddable/EmbeddableList2.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/embeddable/EmbeddableList3.java (77%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/embeddable/EmbeddableMap.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/embeddable/EmbeddableSet.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/embeddable/Item.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/embeddable/ListEqualsHashCodeTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/embeddable/ListNoEqualsHashCodeTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/embeddable/MapEqualsHashCodeTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/embeddable/MapNoEqualsHashCodeTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/embeddable/Name.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/embeddable/NullPointerExceptionTest.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/embeddable/Product.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/embeddable/SetEqualsHashCodeTest.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/embeddable/SetNoEqualsHashCodeTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/embeddable/Type.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/norevision/AbstractCollectionChangeTest.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/norevision/Child.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/norevision/CollectionChangeNoRevisionTest.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/norevision/CollectionChangeRevisionTest.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/norevision/House.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/norevision/Name.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/norevision/Parent.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/collection/norevision/Person.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/Components.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/DefaultValueComponents.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/PropertiesGroupTest.java (84%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/collections/CollectionOfComponents.java (87%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/collections/mappedsuperclasselement/AbstractCode.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/collections/mappedsuperclasselement/Code.java (81%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/collections/mappedsuperclasselement/CollectionOfMappedSuperclassComponentsTest.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/collections/mappedsuperclasselement/MappedSuperclassComponentSetTestEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/dynamic/AdvancedEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/dynamic/Age.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/dynamic/AgeType.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/dynamic/AuditedDynamicComponentEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/dynamic/InternalComponent.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/dynamic/ManyToManyEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/dynamic/ManyToOneEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/dynamic/NotAuditedDynamicComponentTest.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/dynamic/NotAuditedDynamicMapComponent.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/dynamic/OneToOneEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/dynamic/PlainComponent.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/dynamic/PlainEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/dynamic/SanityCheckTest.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/dynamic/SimpleEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/mappedsuperclass/AbstractEmbeddable.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/mappedsuperclass/EmbeddableWithDeclaredData.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredData.java (87%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/mappedsuperclass/EntityWithEmbeddableWithDeclaredData.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/mappedsuperclass/EntityWithEmbeddableWithNoDeclaredData.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/relations/ManyToOneInComponent.java (85%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/relations/NotAuditedManyToOneInComponent.java (85%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/components/relations/OneToManyInComponent.java (86%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/dynamicmodel/DynamicModelTest.java (87%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/entityNames/auditedEntity/Person.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/entityNames/auditedEntity/ReadEntityWhitEntityNameTest.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/entityNames/manyToManyAudited/Car.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/entityNames/manyToManyAudited/Person.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/entityNames/manyToManyAudited/ReadEntityWithAuditedManyToManyTest.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/entityNames/oneToManyAudited/Car.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/entityNames/oneToManyAudited/Person.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/entityNames/oneToManyAudited/ReadEntityWithAuditedCollectionTest.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/entityNames/oneToManyNotAudited/Car.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/entityNames/oneToManyNotAudited/Person.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/entityNames/oneToManyNotAudited/ReadEntityWithAuditedCollectionTest.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/entityNames/singleAssociatedAudited/Car.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/entityNames/singleAssociatedAudited/Person.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/entityNames/singleAssociatedAudited/ReadEntityAssociatedAuditedTest.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/entityNames/singleAssociatedNotAudited/Car.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/entityNames/singleAssociatedNotAudited/Person.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/entityNames/singleAssociatedNotAudited/ReadEntityAssociatedNotAuditedTest.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/flush/AbstractFlushTest.java (87%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/flush/CommitFlush.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/flush/CommitFlushCollectionTest.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/flush/CommitFlushSingleRevisionInTransaction.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/flush/DoubleFlushAddDel.java (87%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/flush/DoubleFlushAddMod.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/flush/DoubleFlushModDel.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/flush/DoubleFlushModMod.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/flush/ManualFlush.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/flush/ManualFlushAutoCommitDisabled.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/hashcode/ChangingHashcode.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/hashcode/ComponentCollectionHashcodeChangeTest.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/hashcode/ListHashcodeChangeTest.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/hashcode/SetHashcodeChangeTest.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/hashcode/WikiImage.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/hashcode/WikiPage.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/CompositeDateId.java (84%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/DateId.java (86%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/ManyToOneIdNotAudited.java (75%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/embeddedid/CorrectChild.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/embeddedid/CorrectChildId.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/embeddedid/IncorrectChild.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/embeddedid/IncorrectChildId.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/embeddedid/Item.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/embeddedid/ItemId.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/embeddedid/Parent.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/embeddedid/Producer.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/embeddedid/PurchaseOrder.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/embeddedid/RelationInsideEmbeddableRemoveTest.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/idclass/ClassType.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/idclass/IdClassReferenceIdentifierTest.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/idclass/IntegerGeneratedIdentityEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/idclass/ReferenceIdentifierClassId.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/idclass/ReferenceIdentifierEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/idclass/RelationalClassId.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/idclass/SampleClass.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/protectedmodifier/ProtectedConstructorEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/protectedmodifier/ProtectedConstructorTest.java (87%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/ids/protectedmodifier/WrappedStringId.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/ChildAuditing.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/ChildEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/ParentAuditing.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/ParentEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/childrelation/ChildIngEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/childrelation/ChildReferencing.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/childrelation/ParentNotIngEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/childrelation/ReferencedEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/discriminatorformula/ChildEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/discriminatorformula/ClassTypeEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/discriminatorformula/DiscriminatorFormulaTest.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/discriminatorformula/ParentEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/notownedrelation/Address.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/notownedrelation/Contact.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/notownedrelation/NotOwnedBidirectional.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/notownedrelation/PersonalContact.java (87%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/relation/ChildIngEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/relation/ParentIngEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/relation/PolymorphicCollection.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/relation/PolymorphicRemovalTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/single/relation/ReferencedEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/tableperclass/ChildAuditing.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/tableperclass/ChildEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/tableperclass/ParentAuditing.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/tableperclass/ParentEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/tableperclass/abstractparent/AbstractEntity.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.java (85%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/tableperclass/abstractparent/EffectiveEntity1.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/tableperclass/notownedrelation/Address.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/tableperclass/notownedrelation/Contact.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/tableperclass/notownedrelation/NotOwnedBidirectional.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/tableperclass/notownedrelation/PersonalContact.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/tableperclass/relation/ChildIngEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/tableperclass/relation/ParentIngEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/tableperclass/relation/PolymorphicCollection.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/inheritance/tableperclass/relation/ReferencedEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/components/Component1.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/components/ComponentTestEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/components/IComponent.java (83%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/components/InterfacesComponents.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/hbm/allAudited/AbstractAllAuditedTest.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/hbm/allAudited/AuditedImplementor.java (84%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/hbm/allAudited/NonAuditedImplementor.java (83%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/hbm/allAudited/SimpleInterface.java (85%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/hbm/allAudited/subclass/SubclassAllAuditedTest.java (72%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/hbm/allAudited/union/UnionAllAuditedTest.java (72%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/hbm/propertiesAudited/AuditedImplementor.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/hbm/propertiesAudited/NonAuditedImplementor.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/hbm/propertiesAudited/SimpleInterface.java (85%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/hbm/propertiesAudited/joined/JoinedPropertiesAuditedTest.java (70%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/hbm/propertiesAudited/subclass/SubclassPropertiesAuditedTest.java (70%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/hbm/propertiesAudited/union/UnionPropertiesAuditedTest.java (70%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/hbm/propertiesAudited2/AbstractPropertiesAudited2Test.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/hbm/propertiesAudited2/AuditedImplementor.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/hbm/propertiesAudited2/NonAuditedImplementor.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/hbm/propertiesAudited2/SimpleInterface.java (85%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/hbm/propertiesAudited2/joined/JoinedPropertiesAudited2Test.java (70%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/hbm/propertiesAudited2/subclass/SubclassPropertiesAudited2Test.java (70%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/hbm/propertiesAudited2/union/UnionPropertiesAudited2Test.java (70%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/relation/ISetRefEdEntity.java (85%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/relation/InterfacesRelation.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/relation/SetRefEdEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/interfaces/relation/SetRefIngEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/jta/DeleteCollectionJtaSessionClosedBeforeCommitTest.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/jta/IdentifierProxyJtaSessionClosedBeforeCommitTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/jta/JtaExceptionListener.java (80%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/jta/JtaSessionClosedBeforeCommitTest.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/jta/JtaTransaction.java (86%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/jta/JtaTransactionAfterCallbackTest.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/jta/OneToManyJtaSessionClosedBeforeCommitTest.java (87%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytomany/BasicList.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytomany/BasicMap.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytomany/BasicSet.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytomany/CustomComparatorEntityTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytomany/IndexColumnListTest.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytomany/MappedByEmbeddableAttributeTest.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytomany/OrderColumnListTest.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytomany/biowned/BasicBiowned.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test/integration/onetomany => orm/test/envers/integration/manytomany}/inverseToSuperclass/DetailSubclass.java (86%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test/integration/onetomany => orm/test/envers/integration/manytomany}/inverseToSuperclass/DetailSubclass2.java (86%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytomany/inverseToSuperclass/DetailSuperclass.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test/integration/onetomany => orm/test/envers/integration/manytomany}/inverseToSuperclass/Root.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytomany/sametable/BasicSametable.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytomany/ternary/TernaryMap.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytomany/ternary/TernaryMapEntity.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytomany/ternary/TernaryMapFlush.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytomany/unidirectional/BasicUniList.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytomany/unidirectional/BasicUniMap.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytomany/unidirectional/BasicUniSet.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytomany/unidirectional/JoinTableDetachedTest.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytomany/unidirectional/M2MIndexedListNotAuditedTarget.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytomany/unidirectional/M2MRelationNotAuditedTarget.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytoone/DetachedUpdateTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytoone/EmbeddedIdManyToOneForeignKeyTest.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/manytoone/unidirectional/RelationNotAuditedTarget.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/merge/AddDelTest.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/merge/GivenIdStrEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/AbstractModifiedFlagsOneSessionTest.java (86%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/DetachedEntityTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/HasChangedAuditedManyToManyRemovalTest.java (84%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/HasChangedAuditedManyToManyTest.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/HasChangedBidirectionalTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/HasChangedComponentCollection.java (87%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/HasChangedComponentMapKey.java (86%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/HasChangedComponents.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/HasChangedDetachedMultipleCollection.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/HasChangedIdMapKey.java (85%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/HasChangedInsertUpdateSameTransactionTest.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/HasChangedManualFlush.java (84%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/HasChangedManyToOneInComponent.java (80%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/HasChangedMergeTest.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/HasChangedNullProperties.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/HasChangedOneToManyInComponent.java (80%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/HasChangedStringMap.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/HasChangedStringSet.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/HasChangedUnversionedProperties.java (85%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/ModifiedFlagSuffix.java (83%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/entities/EnumEntity.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/entities/EnumOption.java (80%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/entities/Professor.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/entities/Student.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/multiplerelations/Address.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/multiplerelations/GroupMemberTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/multiplerelations/MultipleAssociationsTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/multiplerelations/Person.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/BasicNaming.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/DetachedNamingTestEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/EstonianTableAlias.java (86%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/JoinNaming.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/JoinNamingRefEdEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/JoinNamingRefIngEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/NamingTestEntity1.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/NamingTestEntity2.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/OneToManyUnidirectionalNaming.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/VersionsJoinTableNaming.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/VersionsJoinTableRangeComponent.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/VersionsJoinTableRangeComponentTestEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/VersionsJoinTableRangeTestAlternateEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/VersionsJoinTableRangeTestEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/VersionsJoinTableRangeTestEntitySuperClass.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/VersionsJoinTableTestEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/ids/EmbIdNaming.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/ids/JoinEmbIdNaming.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/ids/JoinMulIdNaming.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/ids/JoinMulIdNamingRefEdEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/ids/JoinMulIdNamingRefIngEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/ids/MulIdNaming.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/quotation/QuotedFieldsEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/naming/quotation/QuotedFieldsTest.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/notinsertable/NotInsertable.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/notinsertable/NotInsertableTestEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/notinsertable/manytoone/ManyToOneNotInsertable.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/notinsertable/manytoone/ManyToOneNotInsertableEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/notinsertable/manytoone/NotInsertableEntityType.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/BasicCollection.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/BasicList.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/BasicSet.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/BasicSetWithEmbId.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/BasicSetWithMulId.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/BasicSetWithNullsDelete.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/BidirectionalMapKey.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/IndexColumnListTest.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/InverseSideChanges.java (85%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/OrderColumnListTest.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/RefEdMapKeyEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/RefIngMapKeyEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/detached/BasicDetachedList.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/detached/BasicDetachedSet.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/detached/BasicDetachedSetWithEmbId.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/detached/BasicDetachedSetWithMulId.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/detached/BasicJoinColumnSet.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/detached/DataChangesDetachedSet.java (84%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/detached/DetachedTest.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/detached/DoubleDetachedSet.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/detached/DoubleJoinColumnBidirectionalList.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/detached/IndexedJoinColumnBidirectionalList.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/detached/JoinColumnBidirectionalList.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/detached/JoinColumnBidirectionalListWithInheritance.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/embeddedid/Constant.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/embeddedid/OneToManyCompositeKeyTest.java (98%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/embeddedid/Person.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/embeddedid/PersonTuple.java (98%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/idclass/ManyToManyCompositeKey.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/idclass/ManyToOneOwned.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/idclass/OneToManyOwned.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test/integration/manytomany => orm/test/envers/integration/onetomany}/inverseToSuperclass/DetailSubclass.java (86%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test/integration/manytomany => orm/test/envers/integration/onetomany}/inverseToSuperclass/DetailSubclass2.java (86%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/inverseToSuperclass/DetailSuperclass.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test/integration/manytomany => orm/test/envers/integration/onetomany}/inverseToSuperclass/Root.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/relatedid/AuditRelatedIdInTest.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/relatedid/Company.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetomany/relatedid/Employee.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/BiRefEdEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/BiRefIngEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/BiRefedOptionalEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/BiRefingOptionalEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/Bidirectional.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/Bidirectional2.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/BidirectionalEagerAnnotationTest.java (80%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/BidirectionalEagerHbmTest.java (79%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/BidirectionalNoNulls.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/ids/MulIdBidirectional.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedProxyPerson.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/unidirectional/UniRefEdEntity.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/unidirectional/UniRefIngEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/unidirectional/UniRefIngMulIdEntity.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/unidirectional/Unidirectional.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/unidirectional/UnidirectionalMulIdWithNulls.java (84%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/onetoone/unidirectional/UnidirectionalWithNulls.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/primitive/PrimitiveAddDelete.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/properties/PropertiesTestEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/properties/UnversionedOptimisticLockingField.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/properties/UnversionedOptimisticLockingFieldEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/properties/VersionsProperties.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/proxy/AuditedCollectionProxyTest.java (86%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/proxy/ProxyIdentifier.java (87%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/proxy/QueryingWithProxyObjectTest.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/proxy/RemovedObjectQueryTest.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/AbstractEntityWithChangesQueryTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/AggregateQuery.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/AssociationEntitiesModifiedQueryTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/AssociationToOneLeftJoinQueryTest.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/CustomRevEntityQuery.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/DeletedEntities.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/EntityWithChangesQueryNoModifiedFlagTest.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/EntityWithChangesQueryStoreDeletionDataTest.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/EntityWithChangesQueryTest.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/JoinedInheritancePropertyJoinTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/MaximalizePropertyQuery.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/NotAuditedQueryTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/NullPropertyQuery.java (84%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/RevisionConstraintQuery.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/SimpleQuery.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/StoreDeletedData.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/embeddables/EmbeddableQuery.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/embeddables/NameInfo.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/embeddables/Person.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/entities/Address.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/entities/Car.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/query/entities/Person.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reference/BidirectionalReference.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reference/GreetingPO.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reference/GreetingSetPO.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/CountingRevisionListener.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/Custom.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/CustomBoxed.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/CustomBoxedRevEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/CustomColumnMapping.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/CustomDate.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/CustomNoListener.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/CustomPropertyAccess.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/DifferentDBSchemaTest.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/ExceptionListener.java (87%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/ExceptionListenerRevEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/GloballyConfiguredRevListenerTest.java (84%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/Inherited.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/InheritedRevEntity.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/Listener.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/ListenerRevEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/LongRevNumber.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/LongRevNumberRevEntity.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/MonotonicRevisionNumberTest.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/OverrideCustomRevListenerTest.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/OverrideDefaultRevListenerTest.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/RevisionNumberOverflowTest.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/TestExceptionRevisionListener.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/TestRevisionListener.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/removal/AbstractRevisionEntityRemovalTest.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/removal/RemoveDefaultRevisionEntity.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/removal/RemoveTrackingRevisionEntity.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java (84%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java (84%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/trackmodifiedentities/EntityNamesTest.java (84%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java (82%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/revfordate/RevisionForDate.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/sameids/SameIdTestEntity1.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/sameids/SameIdTestEntity2.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/sameids/SameIds.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/serialization/SerializingCollection.java (86%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/strategy/IdentifierReuseTest.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/strategy/ValidityAuditStrategyManyToManyTest.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/strategy/ValidityAuditStrategyRevEndTsTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java (86%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java (86%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java (93%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java (86%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java (86%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditoverride/AuditClassOverrideTest.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditoverride/AuditOverrideAuditJoinTableTest.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditoverride/AuditPropertyOverrideTest.java (87%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditoverride/AuditedBaseEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditoverride/AuditedSpecialEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditoverride/BaseEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditoverride/ExtendedBaseEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditoverride/MixedOverrideEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditoverride/MixedOverrideTest.java (85%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditoverride/NotAuditedBaseEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditoverride/PropertyOverrideEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditoverride/TransitiveOverrideEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditparents/BabyCompleteEntity.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditparents/ChildCompleteEntity.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditparents/ChildMultipleParentsEntity.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditparents/ChildSingleParentEntity.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditparents/ExplicitTransitiveChildEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditparents/ImplicitTransitiveChildEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditparents/MappedGrandparentEntity.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditparents/MappedParentEntity.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditparents/MultipleAuditParentsTest.java (87%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditparents/SingleAuditParentsTest.java (87%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditparents/TotalAuditParentsTest.java (87%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditparents/TransitiveAuditParentsTest.java (88%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/superclass/auditparents/TransitiveParentEntity.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/tools/OrderSequenceGenerationTest.java (92%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/tools/SchemaExportTest.java (84%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integration/update/SelectBeforeUpdateTest.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/integrator/BasicIntegratorTest.java (95%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/performance/AbstractEntityManagerTest.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/performance/AbstractPerformanceTest.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/performance/AllPerformance.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/performance/ComplexInsertPerformance.java (89%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/performance/EvictAuditDataAfterCommitTest.java (87%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/performance/InsertsOneTransactionPerformance.java (91%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/performance/InsertsPerformance.java (90%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/performance/UpdatesPerformance.java (94%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/performance/complex/ChildEntity1.java (97%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/performance/complex/ChildEntity2.java (96%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/performance/complex/RootEntity.java (98%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/tools/TablePrinter.java (98%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/tools/TestTools.java (98%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/various/Address.java (98%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/various/ExportIdentifierTest.java (98%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/various/HsqlTest.java (98%) rename hibernate-envers/src/test/java/org/hibernate/{envers/test => orm/test/envers}/various/Person.java (97%) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/GlobalConfiguration.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/GlobalConfiguration.java index c9f7eb0db5..f0312a1c18 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/GlobalConfiguration.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/GlobalConfiguration.java @@ -77,7 +77,7 @@ public class GlobalConfiguration { Which operator to use in correlated subqueries (when we want a property to be equal to the result of a correlated subquery, for example: e.p (select max(e2.p) where e2.p2 = e.p2 ...). Normally, this should be "=". However, HSQLDB has an issue related to that, so as a workaround, - "in" is used. See {@link org.hibernate.envers.test.various.HsqlTest}. + "in" is used. See {@link org.hibernate.orm.test.envers.various.HsqlTest}. */ private final String correlatedSubqueryOperator; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTypeColumnDefinitionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTypeColumnDefinitionTest.java index 5799939d47..ac3c0d07bc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTypeColumnDefinitionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTypeColumnDefinitionTest.java @@ -15,8 +15,8 @@ import org.hibernate.annotations.Generated; import org.hibernate.annotations.GenerationTime; import org.hibernate.dialect.H2Dialect; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.mapping.Table; import org.junit.ComparisonFailure; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ColumnScalePrecisionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ColumnScalePrecisionTest.java index 29d0e1d463..8480c19298 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ColumnScalePrecisionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ColumnScalePrecisionTest.java @@ -9,10 +9,11 @@ package org.hibernate.envers.test.integration.basic; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; +import org.hibernate.orm.test.envers.integration.basic.ScalePrecisionEntity; import org.hibernate.testing.TestForIssue; import org.junit.Assert; @@ -29,7 +30,7 @@ public class ColumnScalePrecisionTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { - return new Class[] {ScalePrecisionEntity.class}; + return new Class[] { ScalePrecisionEntity.class}; } @Test @@ -44,9 +45,9 @@ public class ColumnScalePrecisionTest extends BaseEnversJPAFunctionalTestCase { em.getTransaction().commit(); id = entity.getId(); - auditTable = metadata().getEntityBinding( "org.hibernate.envers.test.integration.basic.ScalePrecisionEntity_AUD" ) + auditTable = metadata().getEntityBinding( "org.hibernate.orm.test.envers.integration.basic.ScalePrecisionEntity_AUD" ) .getTable(); - originalTable = metadata().getEntityBinding( "org.hibernate.envers.test.integration.basic.ScalePrecisionEntity" ) + originalTable = metadata().getEntityBinding( "org.hibernate.orm.test.envers.integration.basic.ScalePrecisionEntity" ) .getTable(); } diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EntitySameMapKeyMultiMapValueTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EntitySameMapKeyMultiMapValueTest.java index 60ba8a0cc9..348e725d25 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EntitySameMapKeyMultiMapValueTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EntitySameMapKeyMultiMapValueTest.java @@ -17,8 +17,8 @@ import javax.persistence.Id; import org.hibernate.envers.AuditReader; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EnumMapTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EnumMapTest.java index dc93dd3804..5ad5a5bc9c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EnumMapTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EnumMapTest.java @@ -9,10 +9,10 @@ package org.hibernate.envers.test.integration.collection; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.collection.EnumMapEntity; -import org.hibernate.envers.test.entities.collection.EnumMapType; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.collection.EnumMapEntity; +import org.hibernate.orm.test.envers.entities.collection.EnumMapType; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EnumSet.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EnumSet.java index 38a6a1e599..47d05c1f8a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EnumSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EnumSet.java @@ -10,12 +10,12 @@ import java.util.Arrays; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.collection.EnumSetEntity; -import org.hibernate.envers.test.entities.collection.EnumSetEntity.E1; -import org.hibernate.envers.test.entities.collection.EnumSetEntity.E2; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.collection.EnumSetEntity; +import org.hibernate.orm.test.envers.entities.collection.EnumSetEntity.E1; +import org.hibernate.orm.test.envers.entities.collection.EnumSetEntity.E2; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringMapNationalizedLobTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringMapNationalizedLobTest.java index 9eab2375b2..6f0ceab5fa 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringMapNationalizedLobTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringMapNationalizedLobTest.java @@ -9,7 +9,6 @@ package org.hibernate.envers.test.integration.collection; import java.util.Arrays; import java.util.HashMap; import java.util.Map; - import javax.persistence.ElementCollection; import javax.persistence.Entity; import javax.persistence.Id; @@ -19,13 +18,13 @@ import org.hibernate.annotations.Nationalized; import org.hibernate.dialect.AbstractHANADialect; import org.hibernate.dialect.DB2Dialect; import org.hibernate.dialect.DerbyDialect; -import org.hibernate.dialect.Oracle8iDialect; -import org.hibernate.dialect.PostgreSQL81Dialect; +import org.hibernate.dialect.OracleDialect; +import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.dialect.SybaseDialect; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.TestForIssue; @@ -38,8 +37,8 @@ import static org.junit.Assert.assertEquals; * @author Chris Cranford */ @TestForIssue(jiraKey = "HHH-9834") -@SkipForDialect(Oracle8iDialect.class) -@SkipForDialect(value = PostgreSQL81Dialect.class, jiraKey = "HHH-11477", comment = "@Lob field in HQL predicate fails with error about text = bigint") +@SkipForDialect(OracleDialect.class) +@SkipForDialect(value = PostgreSQLDialect.class, jiraKey = "HHH-11477", comment = "@Lob field in HQL predicate fails with error about text = bigint") @SkipForDialect(value = AbstractHANADialect.class, comment = "HANA doesn't support comparing LOBs with the = operator") @SkipForDialect(value = SybaseDialect.class, comment = "Sybase doesn't support comparing LOBs with the = operator") @SkipForDialect(value = DB2Dialect.class, comment = "DB2 jdbc driver doesn't support setNString") diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKey.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKey.java index d93c48a9d4..2d1c4fc994 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKey.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKey.java @@ -9,12 +9,12 @@ package org.hibernate.envers.test.integration.collection.mapkey; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.components.Component1; -import org.hibernate.envers.test.entities.components.Component2; -import org.hibernate.envers.test.entities.components.ComponentTestEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.components.Component1; +import org.hibernate.orm.test.envers.entities.components.Component2; +import org.hibernate.orm.test.envers.entities.components.ComponentTestEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKeyEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKeyEntity.java index 27c5fbb8f1..4fba33770b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKeyEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKeyEntity.java @@ -16,8 +16,8 @@ import javax.persistence.MapKey; import javax.persistence.Table; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.components.Component1; -import org.hibernate.envers.test.entities.components.ComponentTestEntity; +import org.hibernate.orm.test.envers.entities.components.Component1; +import org.hibernate.orm.test.envers.entities.components.ComponentTestEntity; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKey.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKey.java index d1793e84df..54e499e189 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKey.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKey.java @@ -9,10 +9,10 @@ package org.hibernate.envers.test.integration.collection.mapkey; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKeyEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKeyEntity.java index 08311aee95..adc4c7792b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKeyEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKeyEntity.java @@ -16,7 +16,7 @@ import javax.persistence.MapKey; import javax.persistence.Table; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntity; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/MapKeyEnumeratedNonEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/MapKeyEnumeratedNonEntityTest.java index 5d0d65e9c5..b0129c550d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/MapKeyEnumeratedNonEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/MapKeyEnumeratedNonEntityTest.java @@ -19,14 +19,14 @@ import javax.persistence.MapKeyColumn; import javax.persistence.MapKeyEnumerated; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; import org.hibernate.testing.TestForIssue; -import static org.hibernate.envers.test.tools.TestTools.checkCollection; +import static org.hibernate.orm.test.envers.tools.TestTools.checkCollection; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/MapKeyEnumeratedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/MapKeyEnumeratedTest.java index f032f83063..21e9aed047 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/MapKeyEnumeratedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/MapKeyEnumeratedTest.java @@ -19,9 +19,9 @@ import javax.persistence.MapKeyEnumerated; import javax.persistence.OneToMany; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/EmbeddableWithCollectionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/EmbeddableWithCollectionTest.java index aaf3d338a7..a6017c824c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/EmbeddableWithCollectionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/EmbeddableWithCollectionTest.java @@ -27,8 +27,8 @@ import javax.persistence.Table; import org.hibernate.envers.AuditMappedBy; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/AuditedDynamicComponentTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/AuditedDynamicComponentTest.java index 85f069ad13..d1ba840b67 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/AuditedDynamicComponentTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/AuditedDynamicComponentTest.java @@ -18,8 +18,10 @@ import org.hibernate.cfg.Configuration; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.internal.tools.StringTools; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.components.dynamic.AuditedDynamicComponentEntity; +import org.hibernate.orm.test.envers.integration.components.dynamic.SimpleEntity; import org.hibernate.service.ServiceRegistry; import org.hibernate.testing.ServiceRegistryBuilder; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/EnumTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/EnumTypeTest.java index fc648cb168..0e5aa26183 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/EnumTypeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/EnumTypeTest.java @@ -9,9 +9,9 @@ package org.hibernate.envers.test.integration.customtype; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.customtype.EnumTypeEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.customtype.EnumTypeEntity; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ExtendedEnumTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ExtendedEnumTypeTest.java index dd6f526a3d..b0442494d2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ExtendedEnumTypeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ExtendedEnumTypeTest.java @@ -21,9 +21,8 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.envers.Audited; import org.hibernate.envers.boot.internal.EnversService; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.internal.SessionImpl; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.CustomType; import org.hibernate.usertype.UserType; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeTest.java index 511c7d7b13..2e8afa5545 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeTest.java @@ -12,8 +12,8 @@ import javax.persistence.EntityManager; import org.hibernate.dialect.Oracle8iDialect; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ParametrizedCustom.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ParametrizedCustom.java index 70ca3be6f0..06e0161357 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ParametrizedCustom.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ParametrizedCustom.java @@ -9,9 +9,9 @@ package org.hibernate.envers.test.integration.customtype; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.customtype.ParametrizedCustomTypeEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.customtype.ParametrizedCustomTypeEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/UnspecifiedEnumTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/UnspecifiedEnumTypeTest.java index f2483ecfb4..8b2712640f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/UnspecifiedEnumTypeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/UnspecifiedEnumTypeTest.java @@ -12,9 +12,9 @@ import java.util.Map; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.customtype.UnspecifiedEnumTypeEntity; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.customtype.UnspecifiedEnumTypeEntity; import org.hibernate.type.IntegerType; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Dates.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Dates.java index 21f3d75cd3..3e23da15e5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Dates.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Dates.java @@ -10,8 +10,8 @@ import java.util.Arrays; import java.util.Date; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Enums.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Enums.java index be866d6086..5408281612 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Enums.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Enums.java @@ -9,8 +9,8 @@ package org.hibernate.envers.test.integration.data; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializables.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializables.java index 3974b1b9c5..262dd93536 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializables.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializables.java @@ -11,7 +11,7 @@ import java.util.Map; import javax.persistence.EntityManager; import org.hibernate.dialect.PostgreSQL82Dialect; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java index afddaecdcb..8b10e226dc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java @@ -12,8 +12,8 @@ import java.util.Map; import javax.persistence.EntityManager; import org.hibernate.dialect.PostgreSQL82Dialect; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Serializables.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Serializables.java index 61a69dc30f..5f5a1dc70d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Serializables.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Serializables.java @@ -9,8 +9,8 @@ package org.hibernate.envers.test.integration.data; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/AuditedDynamicComponentsAdvancedCasesTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/dynamic/AuditedDynamicComponentsAdvancedCasesTest.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/AuditedDynamicComponentsAdvancedCasesTest.java rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/dynamic/AuditedDynamicComponentsAdvancedCasesTest.java index 66d4674da1..3395b4cf34 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/AuditedDynamicComponentsAdvancedCasesTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/dynamic/AuditedDynamicComponentsAdvancedCasesTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.dynamic; +package org.hibernate.envers.test.integration.dynamic; import java.util.ArrayList; import java.util.Arrays; @@ -14,13 +14,18 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.hibernate.QueryException; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; import org.hibernate.envers.exception.AuditException; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.components.dynamic.AdvancedEntity; +import org.hibernate.orm.test.envers.integration.components.dynamic.Age; +import org.hibernate.orm.test.envers.integration.components.dynamic.InternalComponent; +import org.hibernate.orm.test.envers.integration.components.dynamic.ManyToManyEntity; +import org.hibernate.orm.test.envers.integration.components.dynamic.ManyToOneEntity; +import org.hibernate.orm.test.envers.integration.components.dynamic.OneToOneEntity; import org.hibernate.testing.TestForIssue; import org.junit.Test; @@ -384,7 +389,7 @@ public class AuditedDynamicComponentsAdvancedCasesTest extends BaseEnversFunctio assertTyping( AuditException.class, e ); Assert.assertEquals( - "This type of relation (org.hibernate.envers.test.integration.components.dynamic.AdvancedEntity.dynamicConfiguration_internalMapWithEntities) isn't supported and can't be used in queries.", + "This type of relation (org.hibernate.orm.test.envers.integration.components.dynamic.AdvancedEntity.dynamicConfiguration_internalMapWithEntities) isn't supported and can't be used in queries.", e.getMessage() ); } diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/generated/GeneratedColumnTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/generated/GeneratedColumnTest.java index 9173bb0c9d..161d6ab137 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/generated/GeneratedColumnTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/generated/GeneratedColumnTest.java @@ -8,8 +8,8 @@ package org.hibernate.envers.test.integration.generated; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/joined/JoinedAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hbm/allAudited/joined/JoinedAllAuditedTest.java similarity index 73% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/joined/JoinedAllAuditedTest.java rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hbm/allAudited/joined/JoinedAllAuditedTest.java index 17aba519dc..f8e1d49ea1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/joined/JoinedAllAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hbm/allAudited/joined/JoinedAllAuditedTest.java @@ -4,9 +4,9 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.hbm.allAudited.joined; +package org.hibernate.envers.test.integration.hbm.allAudited.joined; -import org.hibernate.envers.test.integration.interfaces.hbm.allAudited.AbstractAllAuditedTest; +import org.hibernate.orm.test.envers.integration.interfaces.hbm.allAudited.AbstractAllAuditedTest; /** * @author Hern�n Chanfreau diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/CompositeIds.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/CompositeIds.java index 45f07f6bd1..781426de07 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/CompositeIds.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/CompositeIds.java @@ -9,15 +9,15 @@ package org.hibernate.envers.test.integration.ids; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.ids.CustomEnum; -import org.hibernate.envers.test.entities.ids.EmbId; -import org.hibernate.envers.test.entities.ids.EmbIdTestEntity; -import org.hibernate.envers.test.entities.ids.EmbIdWithCustomType; -import org.hibernate.envers.test.entities.ids.EmbIdWithCustomTypeTestEntity; -import org.hibernate.envers.test.entities.ids.MulId; -import org.hibernate.envers.test.entities.ids.MulIdTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.ids.CustomEnum; +import org.hibernate.orm.test.envers.entities.ids.EmbId; +import org.hibernate.orm.test.envers.entities.ids.EmbIdTestEntity; +import org.hibernate.orm.test.envers.entities.ids.EmbIdWithCustomType; +import org.hibernate.orm.test.envers.entities.ids.EmbIdWithCustomTypeTestEntity; +import org.hibernate.orm.test.envers.entities.ids.MulId; +import org.hibernate.orm.test.envers.entities.ids.MulIdTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/EmbeddedIdGenericsTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/EmbeddedIdGenericsTest.java index 67de748ab9..dd1578edf4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/EmbeddedIdGenericsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/EmbeddedIdGenericsTest.java @@ -22,8 +22,8 @@ import javax.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java index a6b934ae66..002cd09370 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableNotAuditedTest.java @@ -21,8 +21,8 @@ import javax.persistence.ManyToOne; import org.hibernate.envers.Audited; import org.hibernate.envers.RevisionType; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableTest.java index 2fc95bd4bc..31897a5501 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableTest.java @@ -9,8 +9,12 @@ package org.hibernate.envers.test.integration.ids.embeddedid; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.ids.embeddedid.Item; +import org.hibernate.orm.test.envers.integration.ids.embeddedid.ItemId; +import org.hibernate.orm.test.envers.integration.ids.embeddedid.Producer; +import org.hibernate.orm.test.envers.integration.ids.embeddedid.PurchaseOrder; import org.hibernate.testing.TestForIssue; import org.junit.Assert; @@ -26,7 +30,7 @@ public class RelationInsideEmbeddableTest extends BaseEnversJPAFunctionalTestCas @Override protected Class[] getAnnotatedClasses() { - return new Class[] {PurchaseOrder.class, Item.class, ItemId.class, Producer.class}; + return new Class[] { PurchaseOrder.class, Item.class, ItemId.class, Producer.class}; } @Test diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/IdClassWithRelationTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/IdClassWithRelationTest.java index 81dc3d1c6a..49d27cc815 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/IdClassWithRelationTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/IdClassWithRelationTest.java @@ -9,8 +9,11 @@ package org.hibernate.envers.test.integration.ids.idclass; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.ids.idclass.ClassType; +import org.hibernate.orm.test.envers.integration.ids.idclass.RelationalClassId; +import org.hibernate.orm.test.envers.integration.ids.idclass.SampleClass; import org.hibernate.testing.TestForIssue; import org.junit.Test; @@ -26,7 +29,7 @@ public class IdClassWithRelationTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { - return new Class[] {SampleClass.class, RelationalClassId.class, ClassType.class}; + return new Class[] { SampleClass.class, RelationalClassId.class, ClassType.class}; } @Test diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ChildAuditing.java index 83cdf9e15c..155e191292 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ChildAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ChildAuditing.java @@ -10,8 +10,8 @@ package org.hibernate.envers.test.integration.inheritance.joined; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ChildNullAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ChildNullAuditing.java index eec083ecb0..90688d5e5b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ChildNullAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ChildNullAuditing.java @@ -10,8 +10,8 @@ package org.hibernate.envers.test.integration.inheritance.joined; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/DiscriminatorJoinedInheritanceTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/DiscriminatorJoinedInheritanceTest.java index 6c49d042f0..48ba2620f9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/DiscriminatorJoinedInheritanceTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/DiscriminatorJoinedInheritanceTest.java @@ -21,8 +21,8 @@ import javax.persistence.OneToMany; import javax.persistence.Table; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ParentAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ParentAuditing.java index fdbb1987cb..4b5fa58248 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ParentAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ParentAuditing.java @@ -10,8 +10,8 @@ package org.hibernate.envers.test.integration.inheritance.joined; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ChildReferencing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ChildReferencing.java index 336851f2e7..5e33a243e1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ChildReferencing.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ChildReferencing.java @@ -10,9 +10,9 @@ package org.hibernate.envers.test.integration.inheritance.joined.childrelation; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/emptychild/EmptyChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/emptychild/EmptyChildAuditing.java index afd8a27bb2..a7c261fc34 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/emptychild/EmptyChildAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/emptychild/EmptyChildAuditing.java @@ -10,8 +10,8 @@ package org.hibernate.envers.test.integration.inheritance.joined.emptychild; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/NotOwnedBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/NotOwnedBidirectional.java index e061f410c4..512f699b61 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/NotOwnedBidirectional.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/NotOwnedBidirectional.java @@ -10,9 +10,9 @@ package org.hibernate.envers.test.integration.inheritance.joined.notownedrelatio import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinAuditing.java index 766c8c5bd8..ccc59678f5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinAuditing.java @@ -10,8 +10,8 @@ package org.hibernate.envers.test.integration.inheritance.joined.primarykeyjoin; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.envers.test.integration.inheritance.joined.ParentEntity; import org.hibernate.mapping.Column; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ParentReferencingChildTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ParentReferencingChildTest.java index 90d3fc2b9c..b9c714bbb9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ParentReferencingChildTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ParentReferencingChildTest.java @@ -9,9 +9,9 @@ package org.hibernate.envers.test.integration.inheritance.joined.relation; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/PolymorphicCollection.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/PolymorphicCollection.java index 0b3f8682cb..0e7efd2c0d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/PolymorphicCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/PolymorphicCollection.java @@ -10,9 +10,9 @@ package org.hibernate.envers.test.integration.inheritance.joined.relation; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/UnidirectionalDoubleAbstract.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/UnidirectionalDoubleAbstract.java index cecc7d2d79..70300cc398 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/UnidirectionalDoubleAbstract.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/UnidirectionalDoubleAbstract.java @@ -11,8 +11,8 @@ import java.util.Arrays; import java.util.Set; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/MixedInheritanceStrategiesEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/MixedInheritanceStrategiesEntityTest.java index d2957f3529..4856ac28c1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/MixedInheritanceStrategiesEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/MixedInheritanceStrategiesEntityTest.java @@ -8,8 +8,8 @@ package org.hibernate.envers.test.integration.inheritance.mixed; import java.util.Arrays; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.envers.test.integration.inheritance.mixed.entities.AbstractActivity; import org.hibernate.envers.test.integration.inheritance.mixed.entities.AbstractCheckActivity; import org.hibernate.envers.test.integration.inheritance.mixed.entities.Activity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ChildReferencing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ChildReferencing.java index a809153d92..dcc1808e34 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ChildReferencing.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ChildReferencing.java @@ -10,9 +10,9 @@ package org.hibernate.envers.test.integration.inheritance.tableperclass.childrel import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/bidirectional/BidirectionalManyToOneOptionalTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/bidirectional/BidirectionalManyToOneOptionalTest.java index 17e6586ec4..2628c0468e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/bidirectional/BidirectionalManyToOneOptionalTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/bidirectional/BidirectionalManyToOneOptionalTest.java @@ -8,8 +8,8 @@ package org.hibernate.envers.test.integration.manytoone.bidirectional; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/bidirectional/ImplicitMappedByTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/bidirectional/ImplicitMappedByTest.java index 9ccdbb7592..0be4ff3ec9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/bidirectional/ImplicitMappedByTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/bidirectional/ImplicitMappedByTest.java @@ -11,9 +11,9 @@ import java.util.HashSet; import java.util.Set; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/foreignkey/ForeignKeyExclusionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/foreignkey/ForeignKeyExclusionTest.java index 7a2aca9781..167aadbbc1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/foreignkey/ForeignKeyExclusionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/foreignkey/ForeignKeyExclusionTest.java @@ -9,7 +9,7 @@ package org.hibernate.envers.test.integration.manytoone.foreignkey; import java.time.LocalDate; import java.util.ArrayList; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ChildUser.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ChildUser.java index 0d97ec57f1..8c11a758dc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ChildUser.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ChildUser.java @@ -11,9 +11,6 @@ import org.hibernate.envers.NotAudited; import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyDeleteTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyDeleteTest.java index ac0ced5971..acdadea41f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyDeleteTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyDeleteTest.java @@ -6,16 +6,14 @@ */ package org.hibernate.envers.test.integration.manytoone.lazy; -import org.hibernate.Hibernate; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.junit.Test; import java.time.Duration; import java.time.Instant; -import java.util.Arrays; import java.util.Map; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyFetchTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyFetchTest.java index f7cea06d76..eeccda5b0f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyFetchTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/ManyToOneLazyFetchTest.java @@ -11,8 +11,8 @@ import java.time.Instant; import java.util.Arrays; import org.hibernate.Hibernate; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/User.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/User.java index d659a80875..dbcf88c8ef 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/User.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/lazy/User.java @@ -16,7 +16,6 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; -import java.time.Instant; import java.util.List; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicWhereJoinTable.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/maytomany/BasicWhereJoinTable.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicWhereJoinTable.java rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/maytomany/BasicWhereJoinTable.java index cfd2cfa39e..294b891080 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicWhereJoinTable.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/maytomany/BasicWhereJoinTable.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytomany; +package org.hibernate.envers.test.integration.maytomany; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.IntNoAutoIdTestEntity; -import org.hibernate.envers.test.entities.manytomany.WhereJoinTableEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.IntNoAutoIdTestEntity; +import org.hibernate.orm.test.envers.entities.manytomany.WhereJoinTableEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAPITest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAPITest.java index 0e6e3b535a..8ac76e2fe9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAPITest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAPITest.java @@ -10,12 +10,13 @@ import java.util.List; import javax.persistence.EntityManager; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.integration.auditReader.AuditedTestEntity; -import org.hibernate.envers.test.integration.auditReader.NotAuditedTestEntity; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.auditReader.AuditedTestEntity; +import org.hibernate.orm.test.envers.integration.auditReader.NotAuditedTestEntity; -import org.hibernate.envers.test.integration.modifiedflags.entities.EnumEntity; -import org.hibernate.envers.test.integration.modifiedflags.entities.EnumOption; +import org.hibernate.orm.test.envers.integration.modifiedflags.AbstractModifiedFlagsEntityTest; +import org.hibernate.orm.test.envers.integration.modifiedflags.entities.EnumEntity; +import org.hibernate.orm.test.envers.integration.modifiedflags.entities.EnumOption; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedBidirectional2.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedBidirectional2.java index 33e63055ae..78cf59d336 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedBidirectional2.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedBidirectional2.java @@ -9,15 +9,16 @@ package org.hibernate.envers.test.integration.modifiedflags; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.integration.onetoone.bidirectional.BiRefEdEntity; -import org.hibernate.envers.test.integration.onetoone.bidirectional.BiRefIngEntity; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.modifiedflags.AbstractModifiedFlagsEntityTest; +import org.hibernate.orm.test.envers.integration.onetoone.bidirectional.BiRefEdEntity; +import org.hibernate.orm.test.envers.integration.onetoone.bidirectional.BiRefIngEntity; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java index 58875de0b4..949baba81b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java @@ -10,15 +10,16 @@ package org.hibernate.envers.test.integration.modifiedflags; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.envers.test.integration.inheritance.joined.ChildEntity; import org.hibernate.envers.test.integration.inheritance.joined.ParentEntity; +import org.hibernate.orm.test.envers.integration.modifiedflags.AbstractModifiedFlagsEntityTest; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java index 72b77a79db..081183da2f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java @@ -10,16 +10,17 @@ package org.hibernate.envers.test.integration.modifiedflags; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.envers.test.integration.inheritance.joined.childrelation.ChildIngEntity; import org.hibernate.envers.test.integration.inheritance.joined.childrelation.ParentNotIngEntity; import org.hibernate.envers.test.integration.inheritance.joined.childrelation.ReferencedEntity; +import org.hibernate.orm.test.envers.integration.modifiedflags.AbstractModifiedFlagsEntityTest; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedEnumSet.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedEnumSet.java index 5809218255..0fa730f4d2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedEnumSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedEnumSet.java @@ -9,16 +9,17 @@ package org.hibernate.envers.test.integration.modifiedflags; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.collection.EnumSetEntity; -import org.hibernate.envers.test.entities.collection.EnumSetEntity.E1; -import org.hibernate.envers.test.entities.collection.EnumSetEntity.E2; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.collection.EnumSetEntity; +import org.hibernate.orm.test.envers.entities.collection.EnumSetEntity.E1; +import org.hibernate.orm.test.envers.entities.collection.EnumSetEntity.E2; +import org.hibernate.orm.test.envers.integration.modifiedflags.AbstractModifiedFlagsEntityTest; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedForDefaultNotUsing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedForDefaultNotUsing.java index 91f992f8f7..86b4c966f7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedForDefaultNotUsing.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedForDefaultNotUsing.java @@ -10,17 +10,18 @@ import java.util.Arrays; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.components.Component1; -import org.hibernate.envers.test.entities.components.Component2; -import org.hibernate.envers.test.integration.modifiedflags.entities.PartialModifiedFlagsEntity; -import org.hibernate.envers.test.integration.modifiedflags.entities.WithModifiedFlagReferencingEntity; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.components.Component1; +import org.hibernate.orm.test.envers.entities.components.Component2; +import org.hibernate.orm.test.envers.integration.modifiedflags.AbstractModifiedFlagsEntityTest; +import org.hibernate.orm.test.envers.integration.modifiedflags.entities.PartialModifiedFlagsEntity; +import org.hibernate.orm.test.envers.integration.modifiedflags.entities.WithModifiedFlagReferencingEntity; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; /** * @author Michal Skowronek (mskowr at o2 dot pl) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java index 7f034aa746..3844d328d0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java @@ -10,16 +10,17 @@ package org.hibernate.envers.test.integration.modifiedflags; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.envers.test.integration.inheritance.joined.notownedrelation.Address; import org.hibernate.envers.test.integration.inheritance.joined.notownedrelation.Contact; import org.hibernate.envers.test.integration.inheritance.joined.notownedrelation.PersonalContact; +import org.hibernate.orm.test.envers.integration.modifiedflags.AbstractModifiedFlagsEntityTest; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/naming/ImprovedColumnNamingStrategyTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/naming/ImprovedColumnNamingStrategyTest.java index dd7d62b0bf..7eb348dd69 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/naming/ImprovedColumnNamingStrategyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/naming/ImprovedColumnNamingStrategyTest.java @@ -9,7 +9,7 @@ package org.hibernate.envers.test.integration.modifiedflags.naming; import java.util.Map; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/naming/LegacyColumnNamingStrategyTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/naming/LegacyColumnNamingStrategyTest.java index 2914269c0c..ce2febb72b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/naming/LegacyColumnNamingStrategyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/naming/LegacyColumnNamingStrategyTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.envers.test.integration.modifiedflags.naming; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/AuditColumnNameTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/AuditColumnNameTest.java index de11d05656..e6abdbb11f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/AuditColumnNameTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/AuditColumnNameTest.java @@ -9,8 +9,10 @@ package org.hibernate.envers.test.integration.naming; import java.util.List; import javax.persistence.EntityManager; import javax.persistence.Query; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.naming.NamingTestEntity2; + import org.junit.Assert; import org.junit.Test; @@ -19,7 +21,7 @@ public class AuditColumnNameTest extends BaseEnversJPAFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { - return new Class[] {NamingTestEntity2.class}; + return new Class[] { NamingTestEntity2.class}; } @Test diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentNamingTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentNamingTest.java index 6c6898c6d5..74d4cbe34b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentNamingTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentNamingTest.java @@ -11,11 +11,15 @@ import java.util.Iterator; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.components.Component1; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.components.Component1; import org.hibernate.mapping.Column; import org.hibernate.mapping.PersistentClass; +import org.hibernate.orm.test.envers.integration.naming.VersionsJoinTableRangeComponentTestEntity; +import org.hibernate.orm.test.envers.integration.naming.VersionsJoinTableRangeTestAlternateEntity; +import org.hibernate.orm.test.envers.integration.naming.VersionsJoinTableRangeTestEntity; +import org.hibernate.orm.test.envers.integration.naming.VersionsJoinTableRangeTestEntitySuperClass; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/nativequery/EntityResultNativeQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/nativequery/EntityResultNativeQueryTest.java index bb117086f4..09755149e9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/nativequery/EntityResultNativeQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/nativequery/EntityResultNativeQueryTest.java @@ -9,8 +9,8 @@ package org.hibernate.envers.test.integration.nativequery; import java.util.List; import javax.persistence.Query; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naturalid/JoinColumnNaturalIdTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naturalid/JoinColumnNaturalIdTest.java index cccd0a0bce..d400d1e91d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naturalid/JoinColumnNaturalIdTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naturalid/JoinColumnNaturalIdTest.java @@ -8,8 +8,8 @@ package org.hibernate.envers.test.integration.naturalid; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableTest.java index cdc9dda8b4..079d65ef71 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableTest.java @@ -12,8 +12,8 @@ import java.util.Map; import javax.persistence.EntityManager; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/InheritanceIndexedJoinColumnBidirectionalList.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/InheritanceIndexedJoinColumnBidirectionalList.java index 0242ce1a0e..f76fed0fdf 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/InheritanceIndexedJoinColumnBidirectionalList.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/InheritanceIndexedJoinColumnBidirectionalList.java @@ -9,11 +9,11 @@ package org.hibernate.envers.test.integration.onetomany.detached; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.onetomany.detached.inheritance.ChildIndexedListJoinColumnBidirectionalRefIngEntity; -import org.hibernate.envers.test.entities.onetomany.detached.inheritance.ParentIndexedListJoinColumnBidirectionalRefIngEntity; -import org.hibernate.envers.test.entities.onetomany.detached.inheritance.ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.onetomany.detached.inheritance.ChildIndexedListJoinColumnBidirectionalRefIngEntity; +import org.hibernate.orm.test.envers.entities.onetomany.detached.inheritance.ParentIndexedListJoinColumnBidirectionalRefIngEntity; +import org.hibernate.orm.test.envers.entities.onetomany.detached.inheritance.ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/MapsIdTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/MapsIdTest.java index ca2646564d..4fa12793a5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/MapsIdTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/MapsIdTest.java @@ -9,8 +9,11 @@ package org.hibernate.envers.test.integration.onetomany.embeddedid; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.onetomany.embeddedid.Constant; +import org.hibernate.orm.test.envers.integration.onetomany.embeddedid.Person; +import org.hibernate.orm.test.envers.integration.onetomany.embeddedid.PersonTuple; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/hierarchy/HierarchyTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/hierarchy/HierarchyTest.java index 53d5cac863..e6d7248c1b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/hierarchy/HierarchyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/hierarchy/HierarchyTest.java @@ -9,9 +9,9 @@ package org.hibernate.envers.test.integration.onetomany.hierarchy; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/idclass/OneToManyCompositeKeyTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/idclass/OneToManyCompositeKeyTest.java index 9b4bdcb1a8..15b399721e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/idclass/OneToManyCompositeKeyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/idclass/OneToManyCompositeKeyTest.java @@ -9,8 +9,12 @@ package org.hibernate.envers.test.integration.onetomany.idclass; import java.util.Arrays; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.onetomany.idclass.ManyToManyCompositeKey; +import org.hibernate.orm.test.envers.integration.onetomany.idclass.ManyToOneOwned; +import org.hibernate.orm.test.envers.integration.onetomany.idclass.OneToManyOwned; + import org.hibernate.testing.TestForIssue; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalOneToOneOptionalTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalOneToOneOptionalTest.java index 906dbba0df..f456a11dff 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalOneToOneOptionalTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalOneToOneOptionalTest.java @@ -8,8 +8,11 @@ package org.hibernate.envers.test.integration.onetoone.bidirectional; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.onetoone.bidirectional.BiRefedOptionalEntity; +import org.hibernate.orm.test.envers.integration.onetoone.bidirectional.BiRefingOptionalEntity; + import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AssociationToOneInnerJoinQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AssociationToOneInnerJoinQueryTest.java index 2a8822818f..a1ba4e0581 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AssociationToOneInnerJoinQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AssociationToOneInnerJoinQueryTest.java @@ -12,11 +12,11 @@ import javax.persistence.criteria.JoinType; import org.hibernate.envers.AuditReader; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.integration.query.entities.Address; -import org.hibernate.envers.test.integration.query.entities.Car; -import org.hibernate.envers.test.integration.query.entities.Person; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.query.entities.Address; +import org.hibernate.orm.test.envers.integration.query.entities.Car; +import org.hibernate.orm.test.envers.integration.query.entities.Person; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/InheritanceAssociationToOneInnerJoinTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/InheritanceAssociationToOneInnerJoinTest.java index 72da455a2c..ecef7b9cef 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/InheritanceAssociationToOneInnerJoinTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/InheritanceAssociationToOneInnerJoinTest.java @@ -17,8 +17,8 @@ import javax.persistence.OneToOne; import javax.persistence.criteria.JoinType; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByLimitQuery.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByLimitQuery.java index 5e7fd9dd24..83f82d5004 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByLimitQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByLimitQuery.java @@ -11,9 +11,9 @@ import java.util.List; import javax.persistence.EntityManager; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.IntTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.IntTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByOneAuditEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByOneAuditEntityTest.java index 4d83d8bb94..e29bc82006 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByOneAuditEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByOneAuditEntityTest.java @@ -25,7 +25,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.hibernate.envers.AuditMappedBy; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByThreeEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByThreeEntityTest.java index 7ba9a33217..f75fd6b486 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByThreeEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByThreeEntityTest.java @@ -19,7 +19,7 @@ import javax.persistence.Id; import javax.persistence.OrderBy; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityOneAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityOneAuditedTest.java index f9b9aeb792..b7076a83bd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityOneAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityOneAuditedTest.java @@ -24,7 +24,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityTest.java index bd600636c2..608efd8af2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByTwoEntityTest.java @@ -24,7 +24,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.hibernate.envers.AuditMappedBy; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbIdOneToManyQuery.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbIdOneToManyQuery.java index 2870b7710f..4514ed91dc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbIdOneToManyQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbIdOneToManyQuery.java @@ -12,12 +12,12 @@ import java.util.Set; import javax.persistence.EntityManager; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.ids.EmbId; -import org.hibernate.envers.test.entities.onetomany.ids.SetRefEdEmbIdEntity; -import org.hibernate.envers.test.entities.onetomany.ids.SetRefIngEmbIdEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.ids.EmbId; +import org.hibernate.orm.test.envers.entities.onetomany.ids.SetRefEdEmbIdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.ids.SetRefIngEmbIdEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbeddedIdRelatedIdQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbeddedIdRelatedIdQueryTest.java index ce4f8b1c35..4be75e1bcd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbeddedIdRelatedIdQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbeddedIdRelatedIdQueryTest.java @@ -19,8 +19,8 @@ import javax.persistence.ManyToOne; import org.hibernate.envers.Audited; import org.hibernate.envers.RevisionType; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/IdClassRelatedIdQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/IdClassRelatedIdQueryTest.java index c45b41a5eb..aec33be9fb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/IdClassRelatedIdQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/IdClassRelatedIdQueryTest.java @@ -18,8 +18,8 @@ import javax.persistence.ManyToOne; import org.hibernate.envers.Audited; import org.hibernate.envers.RevisionType; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MulIdOneToManyQuery.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MulIdOneToManyQuery.java index 446d1cbe58..c7e389efd3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MulIdOneToManyQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MulIdOneToManyQuery.java @@ -12,12 +12,12 @@ import java.util.Set; import javax.persistence.EntityManager; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.ids.MulId; -import org.hibernate.envers.test.entities.onetomany.ids.SetRefEdMulIdEntity; -import org.hibernate.envers.test.entities.onetomany.ids.SetRefIngMulIdEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.ids.MulId; +import org.hibernate.orm.test.envers.entities.onetomany.ids.SetRefEdMulIdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.ids.SetRefIngMulIdEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MultipleIdRelatedIdQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MultipleIdRelatedIdQueryTest.java index ea16461b82..bf8b1ac922 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MultipleIdRelatedIdQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MultipleIdRelatedIdQueryTest.java @@ -17,8 +17,8 @@ import javax.persistence.ManyToOne; import org.hibernate.envers.Audited; import org.hibernate.envers.RevisionType; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java index b0da44350a..ee36ca977e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java @@ -11,8 +11,8 @@ import java.util.List; import javax.persistence.EntityManager; import org.hibernate.dialect.Oracle8iDialect; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevEntityInheritanceChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevEntityInheritanceChildAuditing.java index c25d8a2d6c..bb225464fb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevEntityInheritanceChildAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevEntityInheritanceChildAuditing.java @@ -9,10 +9,11 @@ package org.hibernate.envers.test.integration.reventity; import java.util.Iterator; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.integration.inheritance.joined.ChildEntity; import org.hibernate.envers.test.integration.inheritance.joined.ParentEntity; import org.hibernate.mapping.Column; +import org.hibernate.orm.test.envers.integration.reventity.LongRevNumberRevEntity; import org.junit.Test; @@ -34,7 +35,7 @@ public class LongRevEntityInheritanceChildAuditing extends BaseEnversJPAFunction public void testChildRevColumnType() { // We need the second column Iterator childEntityKeyColumnsIterator = metadata() - .getEntityBinding("org.hibernate.envers.test.integration.inheritance.joined.ChildEntity_AUD" ) + .getEntityBinding("org.hibernate.orm.test.envers.integration.inheritance.joined.ChildEntity_AUD" ) .getKey() .getColumnIterator(); childEntityKeyColumnsIterator.next(); diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/BasicSecondary.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/BasicSecondary.java index c382a18485..1a686f08d0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/BasicSecondary.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/BasicSecondary.java @@ -10,8 +10,8 @@ import java.util.Arrays; import java.util.Iterator; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.mapping.Join; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/NamingSecondary.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/NamingSecondary.java index b385779b13..e1f964a39c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/NamingSecondary.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/NamingSecondary.java @@ -10,8 +10,8 @@ import java.util.Arrays; import java.util.Iterator; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.mapping.Join; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/EmbIdSecondary.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/EmbIdSecondary.java index bfb2206423..2cd27d0617 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/EmbIdSecondary.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/EmbIdSecondary.java @@ -10,9 +10,9 @@ import java.util.Arrays; import java.util.Iterator; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.ids.EmbId; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.ids.EmbId; import org.hibernate.mapping.Join; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/MulIdSecondary.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/MulIdSecondary.java index 07ec00b390..7c11e0b2e2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/MulIdSecondary.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/MulIdSecondary.java @@ -10,9 +10,9 @@ import java.util.Arrays; import java.util.Iterator; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.ids.MulId; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.ids.MulId; import org.hibernate.mapping.Join; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryEmbIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryEmbIdTestEntity.java index bd4bd7a27d..27b5fc9417 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryEmbIdTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryEmbIdTestEntity.java @@ -13,7 +13,7 @@ import javax.persistence.SecondaryTable; import org.hibernate.envers.Audited; import org.hibernate.envers.SecondaryAuditTable; -import org.hibernate.envers.test.entities.ids.EmbId; +import org.hibernate.orm.test.envers.entities.ids.EmbId; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryMulIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryMulIdTestEntity.java index c2acd041e1..50e0b71c30 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryMulIdTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryMulIdTestEntity.java @@ -14,7 +14,7 @@ import javax.persistence.SecondaryTable; import org.hibernate.envers.Audited; import org.hibernate.envers.SecondaryAuditTable; -import org.hibernate.envers.test.entities.ids.MulId; +import org.hibernate.orm.test.envers.entities.ids.MulId; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractEnversTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/AbstractEnversTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractEnversTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/AbstractEnversTest.java index 126491ece6..dcaa5c224f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractEnversTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/AbstractEnversTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test; +package org.hibernate.orm.test.envers; import java.util.Arrays; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractOneSessionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/AbstractOneSessionTest.java similarity index 98% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractOneSessionTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/AbstractOneSessionTest.java index c3783600de..f99b96ca16 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractOneSessionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/AbstractOneSessionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test; +package org.hibernate.orm.test.envers; import java.io.File; import java.net.URISyntaxException; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversFunctionalTestCase.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/BaseEnversFunctionalTestCase.java similarity index 98% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversFunctionalTestCase.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/BaseEnversFunctionalTestCase.java index 5c86cc64d3..4364ad2dc1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversFunctionalTestCase.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/BaseEnversFunctionalTestCase.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test; +package org.hibernate.orm.test.envers; import java.util.Arrays; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversJPAFunctionalTestCase.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/BaseEnversJPAFunctionalTestCase.java similarity index 98% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversJPAFunctionalTestCase.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/BaseEnversJPAFunctionalTestCase.java index b09cd47271..8e5b496a97 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversJPAFunctionalTestCase.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/BaseEnversJPAFunctionalTestCase.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test; +package org.hibernate.orm.test.envers; import java.util.ArrayList; import java.util.Arrays; @@ -20,7 +20,6 @@ import org.hibernate.cfg.Environment; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.H2Dialect; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; @@ -40,7 +39,6 @@ import org.hibernate.testing.BeforeClassOnce; import org.hibernate.testing.jdbc.SharedDriverManagerConnectionProviderImpl; import org.hibernate.testing.jta.TestingJtaPlatformImpl; import org.hibernate.testing.junit4.Helper; -import org.jboss.logging.Logger; import org.junit.After; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/EnversRunner.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EnversRunner.java similarity index 99% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/EnversRunner.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EnversRunner.java index 112b50ee8a..d7c255be5c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/EnversRunner.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EnversRunner.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test; +package org.hibernate.orm.test.envers; import java.lang.reflect.Modifier; import java.util.ArrayList; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/JpaStaticMetamodelTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/JpaStaticMetamodelTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/JpaStaticMetamodelTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/JpaStaticMetamodelTest.java index c0a0a127ec..7f768a9190 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/JpaStaticMetamodelTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/JpaStaticMetamodelTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test; +package org.hibernate.orm.test.envers; import org.hibernate.envers.DefaultRevisionEntity_; import org.hibernate.envers.DefaultTrackingModifiedEntitiesRevisionEntity_; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/Priority.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/Priority.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/Priority.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/Priority.java index 1e8eb482a3..803f4526a5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/Priority.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/Priority.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test; +package org.hibernate.orm.test.envers; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/IntNoAutoIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntNoAutoIdTestEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/IntNoAutoIdTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntNoAutoIdTestEntity.java index f370f69d02..76e9b22365 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/IntNoAutoIdTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntNoAutoIdTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities; +package org.hibernate.orm.test.envers.entities; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/IntTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/IntTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestEntity.java index a8eca53087..1f5399eb13 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/IntTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities; +package org.hibernate.orm.test.envers.entities; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/IntTestPrivSeqEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestPrivSeqEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/IntTestPrivSeqEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestPrivSeqEntity.java index ae540b863d..64421b8945 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/IntTestPrivSeqEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/IntTestPrivSeqEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities; +package org.hibernate.orm.test.envers.entities; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/PrimitiveTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/PrimitiveTestEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/PrimitiveTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/PrimitiveTestEntity.java index 2d240f9466..5de3f09ce4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/PrimitiveTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/PrimitiveTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities; +package org.hibernate.orm.test.envers.entities; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrIntTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrIntTestEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrIntTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrIntTestEntity.java index 5e57d283ee..38dbc9f8f2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrIntTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrIntTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities; +package org.hibernate.orm.test.envers.entities; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestEntity.java index f9d63e97c4..0f6ecfbe78 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities; +package org.hibernate.orm.test.envers.entities; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrTestEntityComparator.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestEntityComparator.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrTestEntityComparator.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestEntityComparator.java index 58c7332f60..b899306381 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrTestEntityComparator.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestEntityComparator.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities; +package org.hibernate.orm.test.envers.entities; import java.util.Comparator; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrTestNoProxyEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestNoProxyEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrTestNoProxyEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestNoProxyEntity.java index 9d53c2b892..d4432d1f7f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrTestNoProxyEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestNoProxyEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities; +package org.hibernate.orm.test.envers.entities; import java.io.Serializable; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrTestPrivSeqEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestPrivSeqEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrTestPrivSeqEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestPrivSeqEntity.java index 09ab4de297..2817265dcd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrTestPrivSeqEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/StrTestPrivSeqEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities; +package org.hibernate.orm.test.envers.entities; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/UnversionedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/UnversionedEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedEntity.java index c22a19a38c..c0c7c49fe4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/UnversionedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities; +package org.hibernate.orm.test.envers.entities; import javax.persistence.Basic; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/UnversionedStrTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedStrTestEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/UnversionedStrTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedStrTestEntity.java index ca8b670fa0..6fde329459 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/UnversionedStrTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/UnversionedStrTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities; +package org.hibernate.orm.test.envers.entities; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableListEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity1.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableListEntity1.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity1.java index f75d58c488..87f07cc6e6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableListEntity1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity1.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.collection; +package org.hibernate.orm.test.envers.entities.collection; import java.util.ArrayList; import java.util.List; @@ -17,7 +17,7 @@ import javax.persistence.OrderColumn; import javax.persistence.Table; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.components.Component3; +import org.hibernate.orm.test.envers.entities.components.Component3; /** * @author Kristoffer Lundberg (kristoffer at cambio dot se) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableListEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity2.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableListEntity2.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity2.java index 7ed433e851..3c1b64ccba 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableListEntity2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity2.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.collection; +package org.hibernate.orm.test.envers.entities.collection; import java.util.ArrayList; import java.util.List; @@ -17,7 +17,7 @@ import javax.persistence.OrderColumn; import javax.persistence.Table; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.components.relations.ManyToOneEagerComponent; +import org.hibernate.orm.test.envers.entities.components.relations.ManyToOneEagerComponent; /** * Embeddable list with components encapsulating many-to-one relation (referencing some entity). diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableListEntity3.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity3.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableListEntity3.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity3.java index 89bb6e5724..aa6859e1ff 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableListEntity3.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableListEntity3.java @@ -4,10 +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.envers.test.entities.collection; +package org.hibernate.orm.test.envers.entities.collection; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.components.relations.ManyToOneEagerComponent; +import org.hibernate.orm.test.envers.entities.components.relations.ManyToOneEagerComponent; import javax.persistence.*; import java.util.ArrayList; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableMapEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableMapEntity.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableMapEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableMapEntity.java index 87fc0cb32f..6d38979553 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableMapEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableMapEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.collection; +package org.hibernate.orm.test.envers.entities.collection; import java.util.HashMap; import java.util.Map; @@ -17,7 +17,7 @@ import javax.persistence.MapKeyColumn; import javax.persistence.Table; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.components.Component3; +import org.hibernate.orm.test.envers.entities.components.Component3; /** * @author Kristoffer Lundberg (kristoffer at cambio dot se) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableSetEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableSetEntity.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableSetEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableSetEntity.java index 8564caae86..3af01070c8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableSetEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EmbeddableSetEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.collection; +package org.hibernate.orm.test.envers.entities.collection; import java.util.HashSet; import java.util.Set; @@ -16,7 +16,7 @@ import javax.persistence.Id; import javax.persistence.Table; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.components.Component3; +import org.hibernate.orm.test.envers.entities.components.Component3; /** * @author Kristoffer Lundberg (kristoffer at cambio dot se) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EnumMapEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EnumMapEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapEntity.java index 36dea1e6f5..807173f96c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EnumMapEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.collection; +package org.hibernate.orm.test.envers.entities.collection; import java.util.EnumMap; import java.util.Map; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EnumMapType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapType.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EnumMapType.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapType.java index d810f1f64a..e1dab694a7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EnumMapType.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumMapType.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.collection; +package org.hibernate.orm.test.envers.entities.collection; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EnumSetEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumSetEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EnumSetEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumSetEntity.java index f3d1334b63..eda3af31bb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EnumSetEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/EnumSetEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.collection; +package org.hibernate.orm.test.envers.entities.collection; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/MultipleCollectionEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionEntity.java similarity index 98% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/MultipleCollectionEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionEntity.java index 2812439337..b1a34b76d9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/MultipleCollectionEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.collection; +package org.hibernate.orm.test.envers.entities.collection; import java.util.ArrayList; import java.util.Collections; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/MultipleCollectionRefEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity1.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/MultipleCollectionRefEntity1.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity1.java index 780f9f04d7..156ba4bb2e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/MultipleCollectionRefEntity1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity1.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.collection; +package org.hibernate.orm.test.envers.entities.collection; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/MultipleCollectionRefEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity2.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/MultipleCollectionRefEntity2.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity2.java index 32abd689ea..4cd2b0b2d2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/MultipleCollectionRefEntity2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/MultipleCollectionRefEntity2.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.collection; +package org.hibernate.orm.test.envers.entities.collection; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/StringListEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringListEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/StringListEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringListEntity.java index b074593b89..f1bb53c739 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/StringListEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringListEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.collection; +package org.hibernate.orm.test.envers.entities.collection; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/StringMapEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringMapEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/StringMapEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringMapEntity.java index 1cc9033767..8430c679d7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/StringMapEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringMapEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.collection; +package org.hibernate.orm.test.envers.entities.collection; import java.util.HashMap; import java.util.Map; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/StringSetEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringSetEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/StringSetEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringSetEntity.java index d7c126d5e1..12b1b0cd52 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/StringSetEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/collection/StringSetEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.collection; +package org.hibernate.orm.test.envers.entities.collection; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/Component1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component1.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/Component1.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component1.java index 030313c90e..51e1c5745c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/Component1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component1.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.components; +package org.hibernate.orm.test.envers.entities.components; import javax.persistence.Embeddable; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/Component2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component2.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/Component2.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component2.java index ecfb4110a1..8820b5e108 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/Component2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component2.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.components; +package org.hibernate.orm.test.envers.entities.components; import javax.persistence.Embeddable; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/Component3.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component3.java similarity index 98% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/Component3.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component3.java index 1233b34a25..14e34f4da4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/Component3.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component3.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.components; +package org.hibernate.orm.test.envers.entities.components; import javax.persistence.AttributeOverride; import javax.persistence.AttributeOverrides; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/Component4.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component4.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/Component4.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component4.java index dafbeee32f..047482e6fe 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/Component4.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component4.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.components; +package org.hibernate.orm.test.envers.entities.components; import javax.persistence.Embeddable; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/ComponentSetTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentSetTestEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/ComponentSetTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentSetTestEntity.java index 02875dd064..1114711d23 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/ComponentSetTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentSetTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.components; +package org.hibernate.orm.test.envers.entities.components; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/ComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentTestEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/ComponentTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentTestEntity.java index ea9f010c54..3297e4c823 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/ComponentTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/ComponentTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.components; +package org.hibernate.orm.test.envers.entities.components; import javax.persistence.Embedded; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/DefaultValueComponent1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponent1.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/DefaultValueComponent1.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponent1.java index e1f0c6f18f..d339fb52bc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/DefaultValueComponent1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponent1.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.components; +package org.hibernate.orm.test.envers.entities.components; import javax.persistence.Embedded; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/DefaultValueComponent2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponent2.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/DefaultValueComponent2.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponent2.java index be32e212c5..f3f8197e1e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/DefaultValueComponent2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponent2.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.components; +package org.hibernate.orm.test.envers.entities.components; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/DefaultValueComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponentTestEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/DefaultValueComponentTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponentTestEntity.java index 3454929727..e7c4df9d46 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/DefaultValueComponentTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/DefaultValueComponentTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.components; +package org.hibernate.orm.test.envers.entities.components; import javax.persistence.AttributeOverride; import javax.persistence.AttributeOverrides; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/UniquePropsEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/UniquePropsEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/UniquePropsEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/UniquePropsEntity.java index 2dee65e2ef..f75f0d30a7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/UniquePropsEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/UniquePropsEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.components; +package org.hibernate.orm.test.envers.entities.components; import java.io.Serializable; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/UniquePropsNotAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/UniquePropsNotAuditedEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/UniquePropsNotAuditedEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/UniquePropsNotAuditedEntity.java index 38337c9edb..27c72a4692 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/UniquePropsNotAuditedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/UniquePropsNotAuditedEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.components; +package org.hibernate.orm.test.envers.entities.components; import org.hibernate.envers.Audited; import org.hibernate.envers.NotAudited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/ManyToOneComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponent.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/ManyToOneComponent.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponent.java index 923c18386c..60ae543393 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/ManyToOneComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponent.java @@ -4,13 +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.envers.test.entities.components.relations; +package org.hibernate.orm.test.envers.entities.components.relations; import javax.persistence.Embeddable; import javax.persistence.ManyToOne; import javax.persistence.Table; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntity; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/ManyToOneComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponentTestEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/ManyToOneComponentTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponentTestEntity.java index dc7c31d461..c26c09125c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/ManyToOneComponentTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneComponentTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.components.relations; +package org.hibernate.orm.test.envers.entities.components.relations; import javax.persistence.Embedded; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/ManyToOneEagerComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneEagerComponent.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/ManyToOneEagerComponent.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneEagerComponent.java index 9c65a2a7a7..205ede84e2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/ManyToOneEagerComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/ManyToOneEagerComponent.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.components.relations; +package org.hibernate.orm.test.envers.entities.components.relations; import javax.persistence.Embeddable; import javax.persistence.FetchType; @@ -12,7 +12,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.StrTestNoProxyEntity; +import org.hibernate.orm.test.envers.entities.StrTestNoProxyEntity; /** * Do not mark as {@link Audited}. Should be implicitly treated as audited when part of audited entity. diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/NotAuditedManyToOneComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponent.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/NotAuditedManyToOneComponent.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponent.java index db3a69294c..2760e2fc33 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/NotAuditedManyToOneComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponent.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.envers.test.entities.components.relations; +package org.hibernate.orm.test.envers.entities.components.relations; import javax.persistence.Embeddable; import javax.persistence.ManyToOne; import javax.persistence.Table; import org.hibernate.envers.NotAudited; -import org.hibernate.envers.test.entities.UnversionedStrTestEntity; +import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/NotAuditedManyToOneComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponentTestEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/NotAuditedManyToOneComponentTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponentTestEntity.java index 71c29f2a20..5894734eb4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/NotAuditedManyToOneComponentTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/NotAuditedManyToOneComponentTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.components.relations; +package org.hibernate.orm.test.envers.entities.components.relations; import javax.persistence.Embedded; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/OneToManyComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponent.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/OneToManyComponent.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponent.java index c816af3b1e..43d3cdd9fc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/OneToManyComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponent.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.components.relations; +package org.hibernate.orm.test.envers.entities.components.relations; import java.util.HashSet; import java.util.Set; @@ -13,7 +13,7 @@ import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.OneToMany; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntity; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/OneToManyComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponentTestEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/OneToManyComponentTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponentTestEntity.java index 0815189bac..41d1ee6bf7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/OneToManyComponentTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/relations/OneToManyComponentTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.components.relations; +package org.hibernate.orm.test.envers.entities.components.relations; import javax.persistence.Embedded; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/converter/BasicModelingTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/BasicModelingTest.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/converter/BasicModelingTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/BasicModelingTest.java index b5d66d5405..508b47cd94 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/converter/BasicModelingTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/BasicModelingTest.java @@ -4,17 +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.envers.test.entities.converter; +package org.hibernate.orm.test.envers.entities.converter; -import org.hibernate.Session; -import org.hibernate.SessionFactory; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.internal.MetadataImpl; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.envers.test.AbstractEnversTest; +import org.hibernate.orm.test.envers.AbstractEnversTest; import org.hibernate.mapping.PersistentClass; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/converter/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/Person.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/converter/Person.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/Person.java index 1aae0128f1..837bc42953 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/converter/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/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.envers.test.entities.converter; +package org.hibernate.orm.test.envers.entities.converter; import javax.persistence.Convert; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/converter/Sex.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/Sex.java similarity index 84% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/converter/Sex.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/Sex.java index b27ce7fb6e..94afb0c212 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/converter/Sex.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/Sex.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.converter; +package org.hibernate.orm.test.envers.entities.converter; /** * @author Steve Ebersole diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/converter/SexConverter.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/SexConverter.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/converter/SexConverter.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/SexConverter.java index 0c1bdd3178..e51cf080d2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/converter/SexConverter.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/converter/SexConverter.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.converter; +package org.hibernate.orm.test.envers.entities.converter; import javax.persistence.AttributeConverter; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/Component.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/Component.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/Component.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/Component.java index 75b594cef6..58682cc176 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/Component.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/Component.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.customtype; +package org.hibernate.orm.test.envers.entities.customtype; import java.io.Serializable; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/EnumTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/EnumTypeEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/EnumTypeEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/EnumTypeEntity.java index a36374ef40..a156c1128b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/EnumTypeEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/EnumTypeEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.customtype; +package org.hibernate.orm.test.envers.entities.customtype; import javax.persistence.Entity; import javax.persistence.EnumType; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/ParametrizedCustomTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/ParametrizedCustomTypeEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/ParametrizedCustomTypeEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/ParametrizedCustomTypeEntity.java index 84ae86b679..174eb40151 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/ParametrizedCustomTypeEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/ParametrizedCustomTypeEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.customtype; +package org.hibernate.orm.test.envers.entities.customtype; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/ParametrizedTestUserType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/ParametrizedTestUserType.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/ParametrizedTestUserType.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/ParametrizedTestUserType.java index c088f0d03e..7a8e139221 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/ParametrizedTestUserType.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/ParametrizedTestUserType.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.customtype; +package org.hibernate.orm.test.envers.entities.customtype; import java.io.Serializable; import java.sql.PreparedStatement; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/UnspecifiedEnumTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/UnspecifiedEnumTypeEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/UnspecifiedEnumTypeEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/UnspecifiedEnumTypeEntity.java index 9a40876bc6..718c98a687 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/UnspecifiedEnumTypeEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/customtype/UnspecifiedEnumTypeEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.customtype; +package org.hibernate.orm.test.envers.entities.customtype; import java.io.Serializable; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/CompositeDateIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CompositeDateIdTestEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/CompositeDateIdTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CompositeDateIdTestEntity.java index 518e761749..e9cb5e7fae 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/CompositeDateIdTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CompositeDateIdTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.ids; +package org.hibernate.orm.test.envers.entities.ids; import javax.persistence.EmbeddedId; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/CustomEnum.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CustomEnum.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/CustomEnum.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CustomEnum.java index 459b15b4a3..667fcd73e4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/CustomEnum.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CustomEnum.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.ids; +package org.hibernate.orm.test.envers.entities.ids; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/CustomEnumUserType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CustomEnumUserType.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/CustomEnumUserType.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CustomEnumUserType.java index 5837e227e6..8b206642f6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/CustomEnumUserType.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/CustomEnumUserType.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.ids; +package org.hibernate.orm.test.envers.entities.ids; import java.io.Serializable; import java.sql.PreparedStatement; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/DateEmbId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateEmbId.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/DateEmbId.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateEmbId.java index 04e52ccdfd..c627ff464a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/DateEmbId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateEmbId.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.ids; +package org.hibernate.orm.test.envers.entities.ids; import java.io.Serializable; import java.util.Date; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/DateIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateIdTestEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/DateIdTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateIdTestEntity.java index 8348bdb275..010bf2d095 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/DateIdTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/DateIdTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.ids; +package org.hibernate.orm.test.envers.entities.ids; import java.util.Date; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbId.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbId.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbId.java index 7a25121436..8834e16dec 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbId.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.ids; +package org.hibernate.orm.test.envers.entities.ids; import java.io.Serializable; import javax.persistence.Embeddable; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdTestEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbIdTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdTestEntity.java index 69bf26f462..a910038487 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbIdTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.ids; +package org.hibernate.orm.test.envers.entities.ids; import javax.persistence.EmbeddedId; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbIdWithCustomType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomType.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbIdWithCustomType.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomType.java index a6e90b08b2..e5fe1eb31a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbIdWithCustomType.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomType.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.ids; +package org.hibernate.orm.test.envers.entities.ids; import java.io.Serializable; import javax.persistence.Embeddable; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbIdWithCustomTypeTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomTypeTestEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbIdWithCustomTypeTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomTypeTestEntity.java index 5456cf4caf..1b93d5b2b6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbIdWithCustomTypeTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/EmbIdWithCustomTypeTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.ids; +package org.hibernate.orm.test.envers.entities.ids; import javax.persistence.EmbeddedId; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/ManyToOneIdNotAuditedTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneIdNotAuditedTestEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/ManyToOneIdNotAuditedTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneIdNotAuditedTestEntity.java index 3d4d38e4a9..f95cb1911d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/ManyToOneIdNotAuditedTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneIdNotAuditedTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.ids; +package org.hibernate.orm.test.envers.entities.ids; import java.io.Serializable; import javax.persistence.EmbeddedId; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/ManyToOneNotAuditedEmbId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneNotAuditedEmbId.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/ManyToOneNotAuditedEmbId.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneNotAuditedEmbId.java index 27f89dc108..0da0133a02 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/ManyToOneNotAuditedEmbId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/ManyToOneNotAuditedEmbId.java @@ -4,13 +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.envers.test.entities.ids; +package org.hibernate.orm.test.envers.entities.ids; import java.io.Serializable; import javax.persistence.Embeddable; import javax.persistence.ManyToOne; -import org.hibernate.envers.test.entities.UnversionedStrTestEntity; +import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/MulId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/MulId.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/MulId.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/MulId.java index d63b8b75fe..c2c6238617 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/MulId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/MulId.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.ids; +package org.hibernate.orm.test.envers.entities.ids; import java.io.Serializable; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/MulIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/MulIdTestEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/MulIdTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/MulIdTestEntity.java index 308924ce2e..a9a260a69b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/MulIdTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/MulIdTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.ids; +package org.hibernate.orm.test.envers.entities.ids; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/UnusualIdNamingEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/UnusualIdNamingEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/UnusualIdNamingEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/UnusualIdNamingEntity.java index 7f86054042..fd311a10a1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/UnusualIdNamingEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/ids/UnusualIdNamingEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.ids; +package org.hibernate.orm.test.envers.entities.ids; import java.io.Serializable; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/ListOwnedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwnedEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/ListOwnedEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwnedEntity.java index 8f08a77521..d872b67fe8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/ListOwnedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwnedEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytomany; +package org.hibernate.orm.test.envers.entities.manytomany; import java.util.List; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/ListOwningEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwningEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/ListOwningEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwningEntity.java index 97d7f9810a..6c61f0c01f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/ListOwningEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/ListOwningEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytomany; +package org.hibernate.orm.test.envers.entities.manytomany; import java.util.List; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/MapOwnedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwnedEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/MapOwnedEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwnedEntity.java index e6927d822c..61fe3e7796 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/MapOwnedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwnedEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytomany; +package org.hibernate.orm.test.envers.entities.manytomany; import java.util.Set; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/MapOwningEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwningEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/MapOwningEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwningEntity.java index c0e786f175..6320c57be3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/MapOwningEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/MapOwningEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytomany; +package org.hibernate.orm.test.envers.entities.manytomany; import java.util.HashMap; import java.util.Map; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SetOwnedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwnedEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SetOwnedEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwnedEntity.java index 4dc6a1dd7c..6d73c7055a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SetOwnedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwnedEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytomany; +package org.hibernate.orm.test.envers.entities.manytomany; import java.util.Set; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SetOwningEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwningEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SetOwningEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwningEntity.java index f874bd781a..fb958bd098 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SetOwningEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SetOwningEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytomany; +package org.hibernate.orm.test.envers.entities.manytomany; import java.util.Set; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SortedSetEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SortedSetEntity.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SortedSetEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SortedSetEntity.java index 9ac24b81a4..10cadfec03 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SortedSetEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/SortedSetEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytomany; +package org.hibernate.orm.test.envers.entities.manytomany; import java.util.SortedMap; import java.util.SortedSet; @@ -18,8 +18,8 @@ import javax.persistence.MapKeyJoinColumn; import org.hibernate.annotations.SortComparator; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.StrTestEntityComparator; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntityComparator; /** * Entity with custom-ordered SortedSet and SortedMap diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/WhereJoinTableEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/WhereJoinTableEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/WhereJoinTableEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/WhereJoinTableEntity.java index 6a4819338f..f83b0221a3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/WhereJoinTableEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/WhereJoinTableEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytomany; +package org.hibernate.orm.test.envers.entities.manytomany; import java.util.List; import javax.persistence.Entity; @@ -16,7 +16,7 @@ import javax.persistence.ManyToMany; import org.hibernate.annotations.WhereJoinTable; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.IntNoAutoIdTestEntity; +import org.hibernate.orm.test.envers.entities.IntNoAutoIdTestEntity; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/biowned/ListBiowning1Entity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning1Entity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/biowned/ListBiowning1Entity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning1Entity.java index 710d687a95..915f05a469 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/biowned/ListBiowning1Entity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning1Entity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytomany.biowned; +package org.hibernate.orm.test.envers.entities.manytomany.biowned; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/biowned/ListBiowning2Entity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning2Entity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/biowned/ListBiowning2Entity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning2Entity.java index 43aed41ed0..eab5d57dcd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/biowned/ListBiowning2Entity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/biowned/ListBiowning2Entity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytomany.biowned; +package org.hibernate.orm.test.envers.entities.manytomany.biowned; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/sametable/Child1Entity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child1Entity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/sametable/Child1Entity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child1Entity.java index 0e8769fa45..3bb0793a36 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/sametable/Child1Entity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child1Entity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytomany.sametable; +package org.hibernate.orm.test.envers.entities.manytomany.sametable; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/sametable/Child2Entity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child2Entity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/sametable/Child2Entity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child2Entity.java index 0f57f3f1ff..da6bcdf4d3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/sametable/Child2Entity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child2Entity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytomany.sametable; +package org.hibernate.orm.test.envers.entities.manytomany.sametable; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/sametable/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/ParentEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/sametable/ParentEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/ParentEntity.java index 14a3bd3a73..ed3a12da8e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/sametable/ParentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/ParentEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytomany.sametable; +package org.hibernate.orm.test.envers.entities.manytomany.sametable; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/JoinTableEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/JoinTableEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/JoinTableEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/JoinTableEntity.java index 8d916796e9..9e00ac96f9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/JoinTableEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/JoinTableEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytomany.unidirectional; +package org.hibernate.orm.test.envers.entities.manytomany.unidirectional; import java.io.Serializable; import java.util.HashSet; @@ -17,7 +17,7 @@ import javax.persistence.JoinTable; import javax.persistence.ManyToMany; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntity; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/ListUniEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ListUniEntity.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/ListUniEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ListUniEntity.java index 0555e3c729..e6014ded15 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/ListUniEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ListUniEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytomany.unidirectional; +package org.hibernate.orm.test.envers.entities.manytomany.unidirectional; import java.util.List; import javax.persistence.Entity; @@ -12,7 +12,7 @@ import javax.persistence.Id; import javax.persistence.ManyToMany; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntity; /** * Entity owning the many-to-many relation diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/M2MIndexedListTargetNotAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MIndexedListTargetNotAuditedEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/M2MIndexedListTargetNotAuditedEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MIndexedListTargetNotAuditedEntity.java index b602fdb2ab..201c716223 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/M2MIndexedListTargetNotAuditedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MIndexedListTargetNotAuditedEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytomany.unidirectional; +package org.hibernate.orm.test.envers.entities.manytomany.unidirectional; import java.util.ArrayList; import java.util.List; @@ -19,7 +19,7 @@ import javax.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import org.hibernate.envers.test.entities.UnversionedStrTestEntity; +import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity; /** * @author Vladimir Klyushnikov diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/M2MTargetNotAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MTargetNotAuditedEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/M2MTargetNotAuditedEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MTargetNotAuditedEntity.java index 15886768d0..ffadb64641 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/M2MTargetNotAuditedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/M2MTargetNotAuditedEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytomany.unidirectional; +package org.hibernate.orm.test.envers.entities.manytomany.unidirectional; import java.util.List; import javax.persistence.Entity; @@ -15,7 +15,7 @@ import javax.persistence.Table; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import org.hibernate.envers.test.entities.UnversionedStrTestEntity; +import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity; /** * Audited entity with a many-to-many-reference to not audited entity. diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/ManyToManyNotAuditedNullEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ManyToManyNotAuditedNullEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/ManyToManyNotAuditedNullEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ManyToManyNotAuditedNullEntity.java index f2d36ab721..1fca68a6f4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/ManyToManyNotAuditedNullEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/ManyToManyNotAuditedNullEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytomany.unidirectional; +package org.hibernate.orm.test.envers.entities.manytomany.unidirectional; import java.io.Serializable; import java.util.ArrayList; @@ -21,7 +21,7 @@ import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import org.hibernate.envers.test.entities.UnversionedStrTestEntity; +import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/MapUniEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/MapUniEntity.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/MapUniEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/MapUniEntity.java index d718549d62..dfff308e58 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/MapUniEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/MapUniEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytomany.unidirectional; +package org.hibernate.orm.test.envers.entities.manytomany.unidirectional; import java.util.Map; import javax.persistence.Entity; @@ -13,7 +13,7 @@ import javax.persistence.ManyToMany; import javax.persistence.MapKeyColumn; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntity; /** * Entity with a map from a string to an entity diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/SetUniEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/SetUniEntity.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/SetUniEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/SetUniEntity.java index 3cdb3efe3e..8854948105 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/SetUniEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/unidirectional/SetUniEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytomany.unidirectional; +package org.hibernate.orm.test.envers.entities.manytomany.unidirectional; import java.util.Set; import javax.persistence.Entity; @@ -12,7 +12,7 @@ import javax.persistence.Id; import javax.persistence.ManyToMany; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntity; /** * Entity owning the many-to-many relation diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytoone/unidirectional/ExtManyToOneNotAuditedNullEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ExtManyToOneNotAuditedNullEntity.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytoone/unidirectional/ExtManyToOneNotAuditedNullEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ExtManyToOneNotAuditedNullEntity.java index 6a88935696..b79e6d482e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytoone/unidirectional/ExtManyToOneNotAuditedNullEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ExtManyToOneNotAuditedNullEntity.java @@ -4,13 +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.envers.test.entities.manytoone.unidirectional; +package org.hibernate.orm.test.envers.entities.manytoone.unidirectional; import javax.persistence.Entity; import javax.persistence.Table; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.UnversionedStrTestEntity; +import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytoone/unidirectional/ManyToOneNotAuditedNullEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ManyToOneNotAuditedNullEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytoone/unidirectional/ManyToOneNotAuditedNullEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ManyToOneNotAuditedNullEntity.java index 1fb3303615..5f91b691ee 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytoone/unidirectional/ManyToOneNotAuditedNullEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/ManyToOneNotAuditedNullEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytoone.unidirectional; +package org.hibernate.orm.test.envers.entities.manytoone.unidirectional; import java.io.Serializable; import javax.persistence.Entity; @@ -19,7 +19,7 @@ import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import org.hibernate.envers.test.entities.UnversionedStrTestEntity; +import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytoone/unidirectional/TargetNotAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/TargetNotAuditedEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytoone/unidirectional/TargetNotAuditedEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/TargetNotAuditedEntity.java index 8794d56cb6..dca0c74fa8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytoone/unidirectional/TargetNotAuditedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytoone/unidirectional/TargetNotAuditedEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.manytoone.unidirectional; +package org.hibernate.orm.test.envers.entities.manytoone.unidirectional; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -13,7 +13,7 @@ import javax.persistence.ManyToOne; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import org.hibernate.envers.test.entities.UnversionedStrTestEntity; +import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity; /** * Audited entity with a reference to not audited entity. diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/CollectionRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefEdEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/CollectionRefEdEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefEdEntity.java index e4adef1240..eeaa7ecf66 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/CollectionRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefEdEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany; +package org.hibernate.orm.test.envers.entities.onetomany; import java.io.Serializable; import java.util.Collection; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/CollectionRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefIngEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/CollectionRefIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefIngEntity.java index 527099c31f..a261e3e7f5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/CollectionRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/CollectionRefIngEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany; +package org.hibernate.orm.test.envers.entities.onetomany; import java.io.Serializable; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ListRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefEdEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ListRefEdEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefEdEntity.java index b4349e87b3..410224f697 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ListRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefEdEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany; +package org.hibernate.orm.test.envers.entities.onetomany; import java.util.List; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ListRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefIngEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ListRefIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefIngEntity.java index a20f43c980..ea47a5a144 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ListRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ListRefIngEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany; +package org.hibernate.orm.test.envers.entities.onetomany; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/OneToManyNotAuditedNullEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/OneToManyNotAuditedNullEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/OneToManyNotAuditedNullEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/OneToManyNotAuditedNullEntity.java index d98d993dcb..64cfe826d6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/OneToManyNotAuditedNullEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/OneToManyNotAuditedNullEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany; +package org.hibernate.orm.test.envers.entities.onetomany; import java.io.Serializable; import java.util.ArrayList; @@ -21,7 +21,7 @@ import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import org.hibernate.envers.test.entities.UnversionedStrTestEntity; +import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/SetRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefEdEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/SetRefEdEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefEdEntity.java index 276f39be8a..4d361903cb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/SetRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefEdEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany; +package org.hibernate.orm.test.envers.entities.onetomany; import java.util.Set; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/SetRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefIngEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/SetRefIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefIngEntity.java index 2fc6732749..87f8b33b5e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/SetRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/SetRefIngEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany; +package org.hibernate.orm.test.envers.entities.onetomany; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity1.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity1.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity1.java index 2d6eff1165..dbfd66e595 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity1.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.detached; +package org.hibernate.orm.test.envers.entities.onetomany.detached; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -16,7 +16,7 @@ import javax.persistence.Table; import org.hibernate.envers.Audited; /** - * Entity for {@link org.hibernate.envers.test.integration.onetomany.detached.DoubleJoinColumnBidirectionalList} test. + * Entity for {@link org.hibernate.orm.test.envers.integration.onetomany.detached.DoubleJoinColumnBidirectionalList} test. * Owned side of the first relation. * * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity2.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity2.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity2.java index dfaeb22631..bc04753ad5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity2.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.detached; +package org.hibernate.orm.test.envers.entities.onetomany.detached; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -16,7 +16,7 @@ import javax.persistence.Table; import org.hibernate.envers.Audited; /** - * Entity for {@link org.hibernate.envers.test.integration.onetomany.detached.DoubleJoinColumnBidirectionalList} test. + * Entity for {@link org.hibernate.orm.test.envers.integration.onetomany.detached.DoubleJoinColumnBidirectionalList} test. * Owned side of the second relation. * * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefIngEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefIngEntity.java index e96db5dad2..6c809526f8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefIngEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.detached; +package org.hibernate.orm.test.envers.entities.onetomany.detached; import java.util.ArrayList; import java.util.List; @@ -19,7 +19,7 @@ import org.hibernate.envers.AuditMappedBy; import org.hibernate.envers.Audited; /** - * Entity for {@link org.hibernate.envers.test.integration.onetomany.detached.DoubleJoinColumnBidirectionalList} test. + * Entity for {@link org.hibernate.orm.test.envers.integration.onetomany.detached.DoubleJoinColumnBidirectionalList} test. * Owning side of the relations. * * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleSetRefCollEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleSetRefCollEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleSetRefCollEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleSetRefCollEntity.java index b8739d6c00..bde48c8f79 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleSetRefCollEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/DoubleSetRefCollEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.detached; +package org.hibernate.orm.test.envers.entities.onetomany.detached; import java.util.Set; import javax.persistence.Entity; @@ -13,7 +13,7 @@ import javax.persistence.JoinTable; import javax.persistence.OneToMany; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntity; /** * Set collection of references entity diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefEdEntity.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefEdEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefEdEntity.java index dbb416cb39..9b5ec4c8f8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefEdEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.detached; +package org.hibernate.orm.test.envers.entities.onetomany.detached; import javax.persistence.Column; import javax.persistence.Entity; @@ -17,7 +17,7 @@ import javax.persistence.Table; import org.hibernate.envers.Audited; /** - * Entity for {@link org.hibernate.envers.test.integration.onetomany.detached.IndexedJoinColumnBidirectionalList} test. + * Entity for {@link org.hibernate.orm.test.envers.integration.onetomany.detached.IndexedJoinColumnBidirectionalList} test. * Owned side of the relation. * * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefIngEntity.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefIngEntity.java index b89b01f7ab..7731f9b59a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefIngEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.detached; +package org.hibernate.orm.test.envers.entities.onetomany.detached; import java.util.ArrayList; import java.util.Arrays; @@ -21,7 +21,7 @@ import org.hibernate.envers.AuditMappedBy; import org.hibernate.envers.Audited; /** - * Entity for {@link org.hibernate.envers.test.integration.onetomany.detached.IndexedJoinColumnBidirectionalList} test. + * Entity for {@link org.hibernate.orm.test.envers.integration.onetomany.detached.IndexedJoinColumnBidirectionalList} test. * Owning side of the relation. * * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdChildEntity.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdChildEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdChildEntity.java index 07a6ead02e..dfb2db4017 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdChildEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdChildEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.detached; +package org.hibernate.orm.test.envers.entities.onetomany.detached; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; @@ -13,7 +13,7 @@ import javax.persistence.Table; import org.hibernate.envers.Audited; /** - * Entity for {@link org.hibernate.envers.test.integration.onetomany.detached.JoinColumnBidirectionalListWithInheritance} test. + * Entity for {@link org.hibernate.orm.test.envers.integration.onetomany.detached.JoinColumnBidirectionalListWithInheritance} test. * Owned child side of the relation. * * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdParentEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdParentEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdParentEntity.java index 9f091d03e5..1f8373b988 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdParentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdParentEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.detached; +package org.hibernate.orm.test.envers.entities.onetomany.detached; import javax.persistence.DiscriminatorColumn; import javax.persistence.DiscriminatorType; @@ -21,7 +21,7 @@ import javax.persistence.Table; import org.hibernate.envers.Audited; /** - * Entity for {@link org.hibernate.envers.test.integration.onetomany.detached.JoinColumnBidirectionalListWithInheritance} test. + * Entity for {@link org.hibernate.orm.test.envers.integration.onetomany.detached.JoinColumnBidirectionalListWithInheritance} test. * Owned parent side of the relation. * * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefIngEntity.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefIngEntity.java index 3f05862b7e..67a30d5280 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefIngEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.detached; +package org.hibernate.orm.test.envers.entities.onetomany.detached; import java.util.ArrayList; import java.util.Arrays; @@ -20,7 +20,7 @@ import org.hibernate.envers.AuditMappedBy; import org.hibernate.envers.Audited; /** - * Entity for {@link org.hibernate.envers.test.integration.onetomany.detached.JoinColumnBidirectionalListWithInheritance} test. + * Entity for {@link org.hibernate.orm.test.envers.integration.onetomany.detached.JoinColumnBidirectionalListWithInheritance} test. * Owning side of the relation. * * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefEdEntity.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalRefEdEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefEdEntity.java index 6e03bda2e6..da75af4553 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefEdEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.detached; +package org.hibernate.orm.test.envers.entities.onetomany.detached; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -16,7 +16,7 @@ import javax.persistence.Table; import org.hibernate.envers.Audited; /** - * Entity for {@link org.hibernate.envers.test.integration.onetomany.detached.JoinColumnBidirectionalList} test. + * Entity for {@link org.hibernate.orm.test.envers.integration.onetomany.detached.JoinColumnBidirectionalList} test. * Owned side of the relation. * * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefIngEntity.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalRefIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefIngEntity.java index 0f3a5296de..971b245863 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListJoinColumnBidirectionalRefIngEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.detached; +package org.hibernate.orm.test.envers.entities.onetomany.detached; import java.util.ArrayList; import java.util.Arrays; @@ -20,7 +20,7 @@ import org.hibernate.envers.AuditMappedBy; import org.hibernate.envers.Audited; /** - * Entity for {@link org.hibernate.envers.test.integration.onetomany.detached.JoinColumnBidirectionalList} test. + * Entity for {@link org.hibernate.orm.test.envers.integration.onetomany.detached.JoinColumnBidirectionalList} test. * Owning side of the relation. * * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListRefCollEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListRefCollEntity.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListRefCollEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListRefCollEntity.java index b9aa37834c..ff361d9db9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListRefCollEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ListRefCollEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.detached; +package org.hibernate.orm.test.envers.entities.onetomany.detached; import java.util.List; import javax.persistence.Entity; @@ -12,7 +12,7 @@ import javax.persistence.Id; import javax.persistence.OneToMany; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntity; /** * Set collection of references entity diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/SetJoinColumnRefCollEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetJoinColumnRefCollEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/SetJoinColumnRefCollEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetJoinColumnRefCollEntity.java index c6bfa413f6..3bcd3a1324 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/SetJoinColumnRefCollEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetJoinColumnRefCollEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.detached; +package org.hibernate.orm.test.envers.entities.onetomany.detached; import java.util.Set; import javax.persistence.Entity; @@ -15,7 +15,7 @@ import javax.persistence.Table; import org.hibernate.envers.AuditJoinTable; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntity; /** * A detached relation to another entity, with a @OneToMany+@JoinColumn mapping. diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/SetRefCollEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetRefCollEntity.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/SetRefCollEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetRefCollEntity.java index b9ac661df6..061d4bffbf 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/SetRefCollEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/SetRefCollEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.detached; +package org.hibernate.orm.test.envers.entities.onetomany.detached; import java.util.Set; import javax.persistence.Entity; @@ -12,7 +12,7 @@ import javax.persistence.Id; import javax.persistence.OneToMany; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntity; /** * Set collection of references entity diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java index e085e947e8..3f7061d11f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.detached.ids; +package org.hibernate.orm.test.envers.entities.onetomany.detached.ids; import java.util.Set; import javax.persistence.EmbeddedId; @@ -13,8 +13,8 @@ import javax.persistence.OneToMany; import javax.persistence.Table; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.ids.EmbId; -import org.hibernate.envers.test.entities.ids.EmbIdTestEntity; +import org.hibernate.orm.test.envers.entities.ids.EmbId; +import org.hibernate.orm.test.envers.entities.ids.EmbIdTestEntity; /** * Set collection of references entity diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ids/SetRefCollEntityMulId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityMulId.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ids/SetRefCollEntityMulId.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityMulId.java index 179a359944..eaf6756dbc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ids/SetRefCollEntityMulId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/ids/SetRefCollEntityMulId.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.detached.ids; +package org.hibernate.orm.test.envers.entities.onetomany.detached.ids; import java.util.Set; import javax.persistence.Entity; @@ -14,8 +14,8 @@ import javax.persistence.OneToMany; import javax.persistence.Table; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.ids.MulId; -import org.hibernate.envers.test.entities.ids.MulIdTestEntity; +import org.hibernate.orm.test.envers.entities.ids.MulId; +import org.hibernate.orm.test.envers.entities.ids.MulIdTestEntity; /** * Set collection of references entity diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ChildIndexedListJoinColumnBidirectionalRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ChildIndexedListJoinColumnBidirectionalRefIngEntity.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ChildIndexedListJoinColumnBidirectionalRefIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ChildIndexedListJoinColumnBidirectionalRefIngEntity.java index 17cf3acd97..eea0791980 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ChildIndexedListJoinColumnBidirectionalRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ChildIndexedListJoinColumnBidirectionalRefIngEntity.java @@ -4,15 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.detached.inheritance; +package org.hibernate.orm.test.envers.entities.onetomany.detached.inheritance; import javax.persistence.Entity; import javax.persistence.Table; import org.hibernate.envers.Audited; +import org.hibernate.envers.test.integration.onetomany.detached.InheritanceIndexedJoinColumnBidirectionalList; /** - * Entity for {@link org.hibernate.envers.test.integration.onetomany.detached.InheritanceIndexedJoinColumnBidirectionalList} test. + * Entity for {@link InheritanceIndexedJoinColumnBidirectionalList} test. * Child, owning side of the relation. * * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ParentIndexedListJoinColumnBidirectionalRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentIndexedListJoinColumnBidirectionalRefIngEntity.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ParentIndexedListJoinColumnBidirectionalRefIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentIndexedListJoinColumnBidirectionalRefIngEntity.java index f7736a667f..f1e0039116 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ParentIndexedListJoinColumnBidirectionalRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentIndexedListJoinColumnBidirectionalRefIngEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.detached.inheritance; +package org.hibernate.orm.test.envers.entities.onetomany.detached.inheritance; import java.util.ArrayList; import java.util.Arrays; @@ -21,9 +21,10 @@ import javax.persistence.Table; import org.hibernate.annotations.IndexColumn; import org.hibernate.envers.AuditMappedBy; import org.hibernate.envers.Audited; +import org.hibernate.envers.test.integration.onetomany.detached.InheritanceIndexedJoinColumnBidirectionalList; /** - * Entity for {@link org.hibernate.envers.test.integration.onetomany.detached.InheritanceIndexedJoinColumnBidirectionalList} test. + * Entity for {@link InheritanceIndexedJoinColumnBidirectionalList} test. * Parent, owning side of the relation. * * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity.java index 80479ccda0..7ce8e3075f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/detached/inheritance/ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.detached.inheritance; +package org.hibernate.orm.test.envers.entities.onetomany.detached.inheritance; import javax.persistence.Column; import javax.persistence.Entity; @@ -15,9 +15,10 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; import org.hibernate.envers.Audited; +import org.hibernate.envers.test.integration.onetomany.detached.InheritanceIndexedJoinColumnBidirectionalList; /** - * Entity for {@link org.hibernate.envers.test.integration.onetomany.detached.InheritanceIndexedJoinColumnBidirectionalList} test. + * Entity for {@link InheritanceIndexedJoinColumnBidirectionalList} test. * Owned side of the relation. * * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefEdEmbIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdEmbIdEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefEdEmbIdEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdEmbIdEntity.java index 9f212a5052..8a1320dd7e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefEdEmbIdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdEmbIdEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.ids; +package org.hibernate.orm.test.envers.entities.onetomany.ids; import java.util.Set; import javax.persistence.EmbeddedId; @@ -12,7 +12,7 @@ import javax.persistence.Entity; import javax.persistence.OneToMany; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.ids.EmbId; +import org.hibernate.orm.test.envers.entities.ids.EmbId; /** * ReferencEd entity diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefEdMulIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdMulIdEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefEdMulIdEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdMulIdEntity.java index 86bf9b707b..0eb6de8d9b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefEdMulIdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefEdMulIdEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.ids; +package org.hibernate.orm.test.envers.entities.onetomany.ids; import java.util.Set; import javax.persistence.Entity; @@ -13,7 +13,7 @@ import javax.persistence.IdClass; import javax.persistence.OneToMany; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.ids.MulId; +import org.hibernate.orm.test.envers.entities.ids.MulId; /** * ReferencEd entity diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefIngEmbIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngEmbIdEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefIngEmbIdEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngEmbIdEntity.java index 5d69be5286..9d843d17a7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefIngEmbIdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngEmbIdEntity.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.envers.test.entities.onetomany.ids; +package org.hibernate.orm.test.envers.entities.onetomany.ids; import javax.persistence.EmbeddedId; import javax.persistence.Entity; import javax.persistence.ManyToOne; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.ids.EmbId; +import org.hibernate.orm.test.envers.entities.ids.EmbId; /** * ReferencIng entity diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefIngMulIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngMulIdEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefIngMulIdEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngMulIdEntity.java index 5da4b97ce9..60ede2c86f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefIngMulIdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetomany/ids/SetRefIngMulIdEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetomany.ids; +package org.hibernate.orm.test.envers.entities.onetomany.ids; import javax.persistence.Entity; import javax.persistence.Id; @@ -12,7 +12,7 @@ import javax.persistence.IdClass; import javax.persistence.ManyToOne; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.ids.MulId; +import org.hibernate.orm.test.envers.entities.ids.MulId; /** * ReferencIng entity diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetoone/BidirectionalEagerAnnotationRefEdOneToOne.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefEdOneToOne.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetoone/BidirectionalEagerAnnotationRefEdOneToOne.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefEdOneToOne.java index 95b55efff3..18851c4e17 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetoone/BidirectionalEagerAnnotationRefEdOneToOne.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefEdOneToOne.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetoone; +package org.hibernate.orm.test.envers.entities.onetoone; import javax.persistence.Entity; import javax.persistence.FetchType; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetoone/BidirectionalEagerAnnotationRefIngOneToOne.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefIngOneToOne.java similarity index 98% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetoone/BidirectionalEagerAnnotationRefIngOneToOne.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefIngOneToOne.java index b2e47f0e8b..312736db56 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetoone/BidirectionalEagerAnnotationRefIngOneToOne.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerAnnotationRefIngOneToOne.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetoone; +package org.hibernate.orm.test.envers.entities.onetoone; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetoone/BidirectionalEagerHbmRefEdPK.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerHbmRefEdPK.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetoone/BidirectionalEagerHbmRefEdPK.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerHbmRefEdPK.java index 1de7877799..033b8bcfec 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetoone/BidirectionalEagerHbmRefEdPK.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerHbmRefEdPK.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetoone; +package org.hibernate.orm.test.envers.entities.onetoone; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetoone/BidirectionalEagerHbmRefIngPK.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerHbmRefIngPK.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetoone/BidirectionalEagerHbmRefIngPK.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerHbmRefIngPK.java index 8ea1b89a3e..9348062a3a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetoone/BidirectionalEagerHbmRefIngPK.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/onetoone/BidirectionalEagerHbmRefIngPK.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.onetoone; +package org.hibernate.orm.test.envers.entities.onetoone; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomDataRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDataRevEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomDataRevEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDataRevEntity.java index 58760e7d4a..1a8821556f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomDataRevEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDataRevEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.reventity; +package org.hibernate.orm.test.envers.entities.reventity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomDateRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDateRevEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomDateRevEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDateRevEntity.java index d66da41e61..942cabcff2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomDateRevEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomDateRevEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.reventity; +package org.hibernate.orm.test.envers.entities.reventity; import java.util.Date; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomPropertyAccessRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomPropertyAccessRevEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomPropertyAccessRevEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomPropertyAccessRevEntity.java index 2bdb88c6da..fdd21f1cf5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomPropertyAccessRevEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomPropertyAccessRevEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.reventity; +package org.hibernate.orm.test.envers.entities.reventity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomRevEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntity.java index abad67240b..c3fca6c151 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomRevEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.reventity; +package org.hibernate.orm.test.envers.entities.reventity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomRevEntityColumnMapping.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntityColumnMapping.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomRevEntityColumnMapping.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntityColumnMapping.java index 9a68617ac8..a96f47d2ee 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomRevEntityColumnMapping.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/CustomRevEntityColumnMapping.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.reventity; +package org.hibernate.orm.test.envers.entities.reventity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/AnnotatedTrackingRevisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/AnnotatedTrackingRevisionEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/AnnotatedTrackingRevisionEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/AnnotatedTrackingRevisionEntity.java index 1bf942e1ad..3863931ea2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/AnnotatedTrackingRevisionEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/AnnotatedTrackingRevisionEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.reventity.trackmodifiedentities; +package org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities; import java.util.Set; import javax.persistence.Column; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/CustomTrackingRevisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/CustomTrackingRevisionEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/CustomTrackingRevisionEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/CustomTrackingRevisionEntity.java index 853901431a..34330add1d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/CustomTrackingRevisionEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/CustomTrackingRevisionEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.reventity.trackmodifiedentities; +package org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/CustomTrackingRevisionListener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/CustomTrackingRevisionListener.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/CustomTrackingRevisionListener.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/CustomTrackingRevisionListener.java index 23bd7aa2c1..12a14a8799 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/CustomTrackingRevisionListener.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/CustomTrackingRevisionListener.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.reventity.trackmodifiedentities; +package org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities; import org.hibernate.envers.EntityTrackingRevisionListener; import org.hibernate.envers.RevisionType; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java index 29ce883fbd..de9603e334 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.reventity.trackmodifiedentities; +package org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ExtendedRevisionListener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ExtendedRevisionListener.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ExtendedRevisionListener.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ExtendedRevisionListener.java index f43b3cf5f8..b4abf8b5bb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ExtendedRevisionListener.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ExtendedRevisionListener.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.reventity.trackmodifiedentities; +package org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities; import org.hibernate.envers.RevisionListener; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ModifiedEntityTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ModifiedEntityTypeEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ModifiedEntityTypeEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ModifiedEntityTypeEntity.java index 93241ddc2f..8f3cbd2f69 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ModifiedEntityTypeEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/reventity/trackmodifiedentities/ModifiedEntityTypeEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.entities.reventity.trackmodifiedentities; +package org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/AttributeAccessorTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/AttributeAccessorTest.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/AttributeAccessorTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/AttributeAccessorTest.java index 3577714b02..bc802a9e16 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/AttributeAccessorTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/AttributeAccessorTest.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.envers.test.integration.accesstype; +package org.hibernate.orm.test.envers.integration.accesstype; import javax.persistence.Entity; import javax.persistence.Id; import org.hibernate.annotations.AttributeAccessor; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.property.access.internal.PropertyAccessStrategyBasicImpl; import org.hibernate.property.access.spi.PropertyAccess; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/Country.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/Country.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/Country.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/Country.java index e628c075a0..184f865efd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/Country.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/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.envers.test.integration.accesstype; +package org.hibernate.orm.test.envers.integration.accesstype; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/FieldAccessType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessType.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/FieldAccessType.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessType.java index 95b4b4dbc7..e6751e5fad 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/FieldAccessType.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessType.java @@ -5,13 +5,13 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.accesstype; +package org.hibernate.orm.test.envers.integration.accesstype; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/FieldAccessTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessTypeEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/FieldAccessTypeEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessTypeEntity.java index accf018b26..a347fe2059 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/FieldAccessTypeEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/FieldAccessTypeEntity.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.accesstype; +package org.hibernate.orm.test.envers.integration.accesstype; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/ImmutableClassAccessType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/ImmutableClassAccessType.java similarity index 87% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/ImmutableClassAccessType.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/ImmutableClassAccessType.java index 65c6d67a0e..8f3f638625 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/ImmutableClassAccessType.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/ImmutableClassAccessType.java @@ -4,13 +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.envers.test.integration.accesstype; +package org.hibernate.orm.test.envers.integration.accesstype; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/MixedAccessType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessType.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/MixedAccessType.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessType.java index b377261ed6..35b6ee587e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/MixedAccessType.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessType.java @@ -4,13 +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.envers.test.integration.accesstype; +package org.hibernate.orm.test.envers.integration.accesstype; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/MixedAccessTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessTypeEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/MixedAccessTypeEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessTypeEntity.java index d17273ed3b..e68bff52d4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/MixedAccessTypeEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/MixedAccessTypeEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.accesstype; +package org.hibernate.orm.test.envers.integration.accesstype; import javax.persistence.AccessType; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/PropertyAccessType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessType.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/PropertyAccessType.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessType.java index ba0d651dfb..41e5da60ac 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/PropertyAccessType.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessType.java @@ -4,13 +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.envers.test.integration.accesstype; +package org.hibernate.orm.test.envers.integration.accesstype; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/PropertyAccessTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessTypeEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/PropertyAccessTypeEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessTypeEntity.java index cc3fabbd46..d129831eb6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/PropertyAccessTypeEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/accesstype/PropertyAccessTypeEntity.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.accesstype; +package org.hibernate.orm.test.envers.integration.accesstype; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/auditReader/AuditReaderAPITest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditReaderAPITest.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/auditReader/AuditReaderAPITest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditReaderAPITest.java index d979c02329..5f121a1ea5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/auditReader/AuditReaderAPITest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditReaderAPITest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.auditReader; +package org.hibernate.orm.test.envers.integration.auditReader; import java.util.Arrays; import java.util.List; @@ -13,8 +13,8 @@ import javax.persistence.EntityManager; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; import org.hibernate.envers.exception.NotAuditedException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/auditReader/AuditedTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditedTestEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/auditReader/AuditedTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditedTestEntity.java index bb385f0a17..7bb154983b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/auditReader/AuditedTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/AuditedTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.auditReader; +package org.hibernate.orm.test.envers.integration.auditReader; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/auditReader/FindByRevisionExactMatchOptionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/FindByRevisionExactMatchOptionTest.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/auditReader/FindByRevisionExactMatchOptionTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/FindByRevisionExactMatchOptionTest.java index adbf1d1907..4f8978bb80 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/auditReader/FindByRevisionExactMatchOptionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/FindByRevisionExactMatchOptionTest.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.auditReader; +package org.hibernate.orm.test.envers.integration.auditReader; import java.util.Arrays; import java.util.Map; import org.hibernate.envers.AuditReader; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.IntNoAutoIdTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.IntNoAutoIdTestEntity; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/auditReader/NotAuditedTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/NotAuditedTestEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/auditReader/NotAuditedTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/NotAuditedTestEntity.java index 4b832ecc3c..117df004ca 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/auditReader/NotAuditedTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/auditReader/NotAuditedTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.auditReader; +package org.hibernate.orm.test.envers.integration.auditReader; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity1.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity1.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity1.java index fe14068814..5a6c1bcb8c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity1.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity2.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity2.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity2.java index beabd9b6b5..933416b606 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity2.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity3.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity3.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity3.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity3.java index c680c5db05..9c40eae694 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity3.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity3.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity4.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity4.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity4.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity4.java index c406fd64fa..80b6293b00 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity4.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BasicTestEntity4.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BigDecimalTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BigDecimalTypeTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BigDecimalTypeTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BigDecimalTypeTest.java index 6980b90ba1..a63eb4a158 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BigDecimalTypeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/BigDecimalTypeTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import java.math.BigDecimal; import java.util.Arrays; @@ -17,8 +17,8 @@ import javax.persistence.Id; import org.hibernate.envers.Audited; import org.hibernate.envers.NotAudited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/Delete.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Delete.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/Delete.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Delete.java index 5bdd9e31c9..fa36ef1238 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/Delete.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Delete.java @@ -4,13 +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.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/EmptyStringTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/EmptyStringTest.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/EmptyStringTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/EmptyStringTest.java index 72faae9a97..baafab3f45 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/EmptyStringTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/EmptyStringTest.java @@ -4,15 +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.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import java.util.Arrays; import javax.persistence.EntityManager; import org.hibernate.dialect.Oracle8iDialect; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/GlobalVersioned.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/GlobalVersioned.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/GlobalVersioned.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/GlobalVersioned.java index 1d80e84118..2ef2789bb7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/GlobalVersioned.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/GlobalVersioned.java @@ -4,13 +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.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ManyOperationsInTransaction.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ManyOperationsInTransaction.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ManyOperationsInTransaction.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ManyOperationsInTransaction.java index 449b09ffbd..3df8ee887e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ManyOperationsInTransaction.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ManyOperationsInTransaction.java @@ -4,13 +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.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/NoneAudited.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NoneAudited.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/NoneAudited.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NoneAudited.java index 08de0057d8..b09581e5f1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/NoneAudited.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NoneAudited.java @@ -4,11 +4,11 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import java.util.List; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.mapping.PersistentClass; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/NotVersioned.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NotVersioned.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/NotVersioned.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NotVersioned.java index 0eb34f4276..29789ed2f4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/NotVersioned.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NotVersioned.java @@ -4,13 +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.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import javax.persistence.EntityManager; import org.hibernate.envers.exception.NotAuditedException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/NullProperties.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NullProperties.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/NullProperties.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NullProperties.java index 5ac24b6678..d2dbc078e3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/NullProperties.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NullProperties.java @@ -4,13 +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.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/OutsideTransactionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/OutsideTransactionTest.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/OutsideTransactionTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/OutsideTransactionTest.java index 3b7d6d5c75..09b1ccbb00 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/OutsideTransactionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/OutsideTransactionTest.java @@ -4,18 +4,19 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import java.util.Map; import javax.persistence.TransactionRequiredException; import org.hibernate.Session; -import org.hibernate.dialect.MySQL5Dialect; +import org.hibernate.dialect.MySQLDialect; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.integration.collection.norevision.Name; -import org.hibernate.envers.test.integration.collection.norevision.Person; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.integration.collection.norevision.Name; +import org.hibernate.orm.test.envers.integration.collection.norevision.Person; + import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.TestForIssue; import org.junit.Test; @@ -24,7 +25,7 @@ import org.junit.Test; * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ @TestForIssue(jiraKey = "HHH-5565") -@SkipForDialect(value = MySQL5Dialect.class, comment = "The test hangs on") +@SkipForDialect(value = MySQLDialect.class, comment = "The test hangs on") public class OutsideTransactionTest extends BaseEnversFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/RegisterUserEventListenersTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RegisterUserEventListenersTest.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/RegisterUserEventListenersTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RegisterUserEventListenersTest.java index 0fcd1ce166..14da84efe3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/RegisterUserEventListenersTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RegisterUserEventListenersTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import org.hibernate.Session; import org.hibernate.action.spi.AfterTransactionCompletionProcess; @@ -12,8 +12,8 @@ import org.hibernate.action.spi.BeforeTransactionCompletionProcess; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.envers.internal.tools.MutableInteger; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.event.service.spi.EventListenerRegistry; import org.hibernate.event.spi.EventType; import org.hibernate.event.spi.PostInsertEvent; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ScalePrecisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ScalePrecisionEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ScalePrecisionEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ScalePrecisionEntity.java index 92aaed35d5..68f27a2a6c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ScalePrecisionEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/ScalePrecisionEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import java.io.Serializable; import javax.persistence.Column; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/Simple.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Simple.java similarity index 86% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/Simple.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Simple.java index 800c42c530..b6d6dd7f69 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/Simple.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/Simple.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.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.IntTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.IntTestEntity; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/SingleOperationInTransaction.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/SingleOperationInTransaction.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/SingleOperationInTransaction.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/SingleOperationInTransaction.java index 8a419a046e..05e5ac5e26 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/SingleOperationInTransaction.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/SingleOperationInTransaction.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.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import java.util.Arrays; import javax.persistence.EntityManager; import org.hibernate.envers.exception.RevisionDoesNotExistException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/TransactionRollbackBehaviour.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/TransactionRollbackBehaviour.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/TransactionRollbackBehaviour.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/TransactionRollbackBehaviour.java index 8be870f8dc..875c2567d1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/TransactionRollbackBehaviour.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/TransactionRollbackBehaviour.java @@ -4,13 +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.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.entities.IntTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.entities.IntTestEntity; import org.hibernate.internal.SessionImpl; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedPropertiesChange.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedPropertiesChange.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedPropertiesChange.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedPropertiesChange.java index d958c73522..1303ee373f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedPropertiesChange.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedPropertiesChange.java @@ -4,13 +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.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedProperty.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedProperty.java similarity index 86% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedProperty.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedProperty.java index 2384d986f4..1644a241d4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedProperty.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/UnversionedProperty.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.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.UnversionedEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.UnversionedEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/cache/OneToManyCache.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToManyCache.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/cache/OneToManyCache.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToManyCache.java index 1b6053540e..da41aefaee 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/cache/OneToManyCache.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToManyCache.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.envers.test.integration.cache; +package org.hibernate.orm.test.envers.integration.cache; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.onetomany.SetRefEdEntity; -import org.hibernate.envers.test.entities.onetomany.SetRefIngEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.onetomany.SetRefEdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.SetRefIngEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/cache/OneToOneCache.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToOneCache.java similarity index 85% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/cache/OneToOneCache.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToOneCache.java index 4cab7074e7..5fcc574c26 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/cache/OneToOneCache.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/OneToOneCache.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.envers.test.integration.cache; +package org.hibernate.orm.test.envers.integration.cache; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.integration.onetoone.bidirectional.BiRefEdEntity; -import org.hibernate.envers.test.integration.onetoone.bidirectional.BiRefIngEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.onetoone.bidirectional.BiRefEdEntity; +import org.hibernate.orm.test.envers.integration.onetoone.bidirectional.BiRefIngEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/cache/QueryCache.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/QueryCache.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/cache/QueryCache.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/QueryCache.java index 09bfa8d6b9..03139dcea1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/cache/QueryCache.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/cache/QueryCache.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.envers.test.integration.cache; +package org.hibernate.orm.test.envers.integration.cache; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.IntTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.IntTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/CollectionNullValueTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/CollectionNullValueTest.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/CollectionNullValueTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/CollectionNullValueTest.java index 897d7980cb..a43d086cfa 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/CollectionNullValueTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/CollectionNullValueTest.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.envers.test.integration.collection; +package org.hibernate.orm.test.envers.integration.collection; import java.util.Arrays; import java.util.List; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.collection.StringListEntity; -import org.hibernate.envers.test.entities.collection.StringMapEntity; -import org.hibernate.envers.test.entities.collection.StringSetEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.collection.StringListEntity; +import org.hibernate.orm.test.envers.entities.collection.StringMapEntity; +import org.hibernate.orm.test.envers.entities.collection.StringSetEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/DetachedCollectionChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedCollectionChangeTest.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/DetachedCollectionChangeTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedCollectionChangeTest.java index 02fb9addfb..5f331c4be0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/DetachedCollectionChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedCollectionChangeTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection; +package org.hibernate.orm.test.envers.integration.collection; import java.io.Serializable; import java.util.ArrayList; @@ -23,8 +23,8 @@ import javax.persistence.Id; import javax.persistence.ManyToMany; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/DetachedMultipleCollectionChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedMultipleCollectionChangeTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/DetachedMultipleCollectionChangeTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedMultipleCollectionChangeTest.java index 7a26808a36..d93cfacce8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/DetachedMultipleCollectionChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedMultipleCollectionChangeTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection; +package org.hibernate.orm.test.envers.integration.collection; import java.util.ArrayList; import java.util.Arrays; @@ -17,13 +17,14 @@ import javax.transaction.TransactionManager; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.CockroachDialect; import org.hibernate.dialect.Oracle8iDialect; +import org.hibernate.dialect.OracleDialect; import org.hibernate.envers.RevisionType; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.collection.MultipleCollectionEntity; -import org.hibernate.envers.test.entities.collection.MultipleCollectionRefEntity1; -import org.hibernate.envers.test.entities.collection.MultipleCollectionRefEntity2; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.collection.MultipleCollectionEntity; +import org.hibernate.orm.test.envers.entities.collection.MultipleCollectionRefEntity1; +import org.hibernate.orm.test.envers.entities.collection.MultipleCollectionRefEntity2; import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.SkipForDialects; import org.hibernate.testing.TestForIssue; @@ -41,7 +42,7 @@ import static org.junit.Assert.assertNotNull; * @author Erik-Berndt Scheper */ @TestForIssue(jiraKey = "HHH-6349") -@SkipForDialect(value = Oracle8iDialect.class, +@SkipForDialect(value = OracleDialect.class, comment = "Oracle does not support identity key generation") public class DetachedMultipleCollectionChangeTest extends BaseEnversJPAFunctionalTestCase { private TransactionManager tm = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EmbeddableSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EmbeddableSet.java similarity index 83% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EmbeddableSet.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EmbeddableSet.java index 6ce59a5164..98ec72b43e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EmbeddableSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EmbeddableSet.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.envers.test.integration.collection; +package org.hibernate.orm.test.envers.integration.collection; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.entities.collection.EmbeddableSetEntity; -import org.hibernate.envers.test.entities.components.Component3; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.entities.collection.EmbeddableSetEntity; +import org.hibernate.orm.test.envers.entities.components.Component3; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EntityMapCompositeElementTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapCompositeElementTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EntityMapCompositeElementTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapCompositeElementTest.java index ae0ebdc54e..e111ebe10c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EntityMapCompositeElementTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapCompositeElementTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection; +package org.hibernate.orm.test.envers.integration.collection; import java.io.Serializable; import java.util.HashMap; @@ -15,8 +15,8 @@ import org.hibernate.envers.AuditReader; import org.hibernate.envers.Audited; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.AuditQuery; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.FailureExpected; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EntityMapTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapTest.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EntityMapTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapTest.java index 52e223180e..7185a859ac 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EntityMapTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/EntityMapTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection; +package org.hibernate.orm.test.envers.integration.collection; import java.util.Arrays; import java.util.HashMap; @@ -17,9 +17,9 @@ import javax.persistence.Id; import javax.persistence.MappedSuperclass; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/IndexColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/IndexColumnListTest.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/IndexColumnListTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/IndexColumnListTest.java index b545c14344..2f87e65982 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/IndexColumnListTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/IndexColumnListTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection; +package org.hibernate.orm.test.envers.integration.collection; import java.util.ArrayList; import java.util.Arrays; @@ -15,8 +15,8 @@ import javax.persistence.Id; import javax.persistence.OrderColumn; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.transaction.TransactionUtil; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/OrderColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/OrderColumnListTest.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/OrderColumnListTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/OrderColumnListTest.java index e855eedfbf..521f5b39ea 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/OrderColumnListTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/OrderColumnListTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection; +package org.hibernate.orm.test.envers.integration.collection; import java.util.ArrayList; import java.util.Arrays; @@ -16,8 +16,8 @@ import javax.persistence.Id; import javax.persistence.OrderColumn; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringList.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringList.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringList.java index 7693f8c2db..7acecb0762 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringList.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringList.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection; +package org.hibernate.orm.test.envers.integration.collection; import java.util.Arrays; import java.util.Collections; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.collection.StringListEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.collection.StringListEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringMap.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMap.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringMap.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMap.java index b4e88c2ad3..c9d43f6fe4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringMap.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMap.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection; +package org.hibernate.orm.test.envers.integration.collection; import java.util.Arrays; import java.util.Collections; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.collection.StringMapEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.collection.StringMapEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringMapLobTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapLobTest.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringMapLobTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapLobTest.java index 347b9dfc92..d718b76d77 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringMapLobTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapLobTest.java @@ -4,12 +4,11 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection; +package org.hibernate.orm.test.envers.integration.collection; import java.util.Arrays; import java.util.HashMap; import java.util.Map; - import javax.persistence.ElementCollection; import javax.persistence.Entity; import javax.persistence.Id; @@ -18,12 +17,12 @@ import javax.persistence.Lob; import org.hibernate.dialect.AbstractHANADialect; import org.hibernate.dialect.DB2Dialect; import org.hibernate.dialect.DerbyDialect; -import org.hibernate.dialect.Oracle8iDialect; -import org.hibernate.dialect.PostgreSQL81Dialect; +import org.hibernate.dialect.OracleDialect; +import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.TestForIssue; @@ -36,8 +35,8 @@ import static org.junit.Assert.assertEquals; * @author Chris Cranford */ @TestForIssue(jiraKey = "HHH-9834") -@SkipForDialect(Oracle8iDialect.class) -@SkipForDialect(value = PostgreSQL81Dialect.class, jiraKey = "HHH-11477", comment = "@Lob field in HQL predicate fails with error about text = bigint") +@SkipForDialect(OracleDialect.class) +@SkipForDialect(value = PostgreSQLDialect.class, jiraKey = "HHH-11477", comment = "@Lob field in HQL predicate fails with error about text = bigint") @SkipForDialect(value = AbstractHANADialect.class, comment = "HANA doesn't support comparing LOBs with the = operator") @SkipForDialect(value = DB2Dialect.class, comment = "DB2 jdbc driver doesn't support setNString") @SkipForDialect(value = DerbyDialect.class, comment = "Derby jdbc driver doesn't support setNString") diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringSet.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringSet.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringSet.java index f463369ef9..1315b1d4a3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringSet.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection; +package org.hibernate.orm.test.envers.integration.collection; import java.util.Arrays; import java.util.Collections; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.collection.StringSetEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.collection.StringSetEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/BasicEmbeddableCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/BasicEmbeddableCollection.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/BasicEmbeddableCollection.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/BasicEmbeddableCollection.java index d23f81ac1d..90ebfb46ba 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/BasicEmbeddableCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/BasicEmbeddableCollection.java @@ -4,13 +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.envers.test.integration.collection.embeddable; +package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/DarkCharacter.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/DarkCharacter.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/DarkCharacter.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/DarkCharacter.java index bdb59a392f..9df096a9fc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/DarkCharacter.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/DarkCharacter.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection.embeddable; +package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.io.Serializable; import java.util.HashSet; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableList1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList1.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableList1.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList1.java index f2cadc2931..e2eabcc364 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableList1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList1.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.envers.test.integration.collection.embeddable; +package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.util.Arrays; import java.util.Collections; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.collection.EmbeddableListEntity1; -import org.hibernate.envers.test.entities.components.Component3; -import org.hibernate.envers.test.entities.components.Component4; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.collection.EmbeddableListEntity1; +import org.hibernate.orm.test.envers.entities.components.Component3; +import org.hibernate.orm.test.envers.entities.components.Component4; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableList2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList2.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableList2.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList2.java index 5040767b93..c4821905d0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableList2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList2.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection.embeddable; +package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestNoProxyEntity; -import org.hibernate.envers.test.entities.collection.EmbeddableListEntity2; -import org.hibernate.envers.test.entities.components.relations.ManyToOneEagerComponent; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestNoProxyEntity; +import org.hibernate.orm.test.envers.entities.collection.EmbeddableListEntity2; +import org.hibernate.orm.test.envers.entities.components.relations.ManyToOneEagerComponent; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableList3.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList3.java similarity index 77% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableList3.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList3.java index 38366ab14b..30bae58f3d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableList3.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableList3.java @@ -4,13 +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.envers.test.integration.collection.embeddable; +package org.hibernate.orm.test.envers.integration.collection.embeddable; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestNoProxyEntity; -import org.hibernate.envers.test.entities.collection.EmbeddableListEntity3; -import org.hibernate.envers.test.entities.components.relations.ManyToOneEagerComponent; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestNoProxyEntity; +import org.hibernate.orm.test.envers.entities.collection.EmbeddableListEntity3; +import org.hibernate.orm.test.envers.entities.components.relations.ManyToOneEagerComponent; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableMap.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableMap.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableMap.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableMap.java index c17b2b7d45..4a7e19f07d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableMap.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableMap.java @@ -4,18 +4,18 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection.embeddable; +package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.util.Arrays; import java.util.Collections; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.collection.EmbeddableMapEntity; -import org.hibernate.envers.test.entities.components.Component3; -import org.hibernate.envers.test.entities.components.Component4; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.collection.EmbeddableMapEntity; +import org.hibernate.orm.test.envers.entities.components.Component3; +import org.hibernate.orm.test.envers.entities.components.Component4; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableSet.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableSet.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableSet.java index fd05151747..6919122af0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/EmbeddableSet.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.envers.test.integration.collection.embeddable; +package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.collection.EmbeddableSetEntity; -import org.hibernate.envers.test.entities.components.Component3; -import org.hibernate.envers.test.entities.components.Component4; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.collection.EmbeddableSetEntity; +import org.hibernate.orm.test.envers.entities.components.Component3; +import org.hibernate.orm.test.envers.entities.components.Component4; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/Item.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Item.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/Item.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Item.java index 097ba9dac3..3c8b921b84 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/Item.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/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.envers.test.integration.collection.embeddable; +package org.hibernate.orm.test.envers.integration.collection.embeddable; import javax.persistence.Embeddable; import javax.persistence.ManyToOne; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/ListEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListEqualsHashCodeTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/ListEqualsHashCodeTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListEqualsHashCodeTest.java index e1293c1f04..0521d8674b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/ListEqualsHashCodeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListEqualsHashCodeTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection.embeddable; +package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.io.Serializable; import java.util.ArrayList; @@ -19,8 +19,8 @@ import javax.persistence.OrderColumn; import org.hibernate.envers.Audited; import org.hibernate.envers.strategy.ValidityAuditStrategy; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/ListNoEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListNoEqualsHashCodeTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/ListNoEqualsHashCodeTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListNoEqualsHashCodeTest.java index cee058ccfa..ed59d8f9a0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/ListNoEqualsHashCodeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/ListNoEqualsHashCodeTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection.embeddable; +package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.io.Serializable; import java.util.ArrayList; @@ -18,8 +18,8 @@ import javax.persistence.OrderColumn; import org.hibernate.envers.Audited; import org.hibernate.envers.strategy.ValidityAuditStrategy; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/MapEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapEqualsHashCodeTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/MapEqualsHashCodeTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapEqualsHashCodeTest.java index 9d907a2483..edc8feea79 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/MapEqualsHashCodeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapEqualsHashCodeTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection.embeddable; +package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.io.Serializable; import java.util.HashMap; @@ -18,8 +18,8 @@ import javax.persistence.Id; import org.hibernate.envers.Audited; import org.hibernate.envers.strategy.ValidityAuditStrategy; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/MapNoEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapNoEqualsHashCodeTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/MapNoEqualsHashCodeTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapNoEqualsHashCodeTest.java index 1eb8df5ce3..a167052039 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/MapNoEqualsHashCodeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/MapNoEqualsHashCodeTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection.embeddable; +package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.io.Serializable; import java.util.HashMap; @@ -17,8 +17,8 @@ import javax.persistence.Id; import org.hibernate.envers.Audited; import org.hibernate.envers.strategy.ValidityAuditStrategy; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/Name.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Name.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/Name.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Name.java index 83bea63fa7..09fc994a8f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/Name.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/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.envers.test.integration.collection.embeddable; +package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.io.Serializable; import javax.persistence.Embeddable; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/NullPointerExceptionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/NullPointerExceptionTest.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/NullPointerExceptionTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/NullPointerExceptionTest.java index 849244f7c9..9c93c58d5b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/NullPointerExceptionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/NullPointerExceptionTest.java @@ -4,15 +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.envers.test.integration.collection.embeddable; +package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.util.Arrays; import java.util.Map; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.strategy.ValidityAuditStrategy; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/Product.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Product.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/Product.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Product.java index b97177d05e..00699696aa 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/Product.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Product.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection.embeddable; +package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/SetEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetEqualsHashCodeTest.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/SetEqualsHashCodeTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetEqualsHashCodeTest.java index 5e3661a6f8..d2588c37b6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/SetEqualsHashCodeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetEqualsHashCodeTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection.embeddable; +package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.io.Serializable; import java.util.HashSet; @@ -18,9 +18,9 @@ import javax.persistence.Id; import org.hibernate.envers.Audited; import org.hibernate.envers.strategy.ValidityAuditStrategy; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/SetNoEqualsHashCodeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetNoEqualsHashCodeTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/SetNoEqualsHashCodeTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetNoEqualsHashCodeTest.java index a4f420c605..0451365365 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/SetNoEqualsHashCodeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/SetNoEqualsHashCodeTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection.embeddable; +package org.hibernate.orm.test.envers.integration.collection.embeddable; import java.io.Serializable; import java.util.HashSet; @@ -17,8 +17,8 @@ import javax.persistence.Id; import org.hibernate.envers.Audited; import org.hibernate.envers.strategy.ValidityAuditStrategy; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/Type.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Type.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/Type.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Type.java index f16cd8c7f0..e54227e784 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/Type.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/embeddable/Type.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection.embeddable; +package org.hibernate.orm.test.envers.integration.collection.embeddable; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/AbstractCollectionChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/AbstractCollectionChangeTest.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/AbstractCollectionChangeTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/AbstractCollectionChangeTest.java index 6ede10d7ec..0b941601b6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/AbstractCollectionChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/AbstractCollectionChangeTest.java @@ -4,15 +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.envers.test.integration.collection.norevision; +package org.hibernate.orm.test.envers.integration.collection.norevision; import java.util.List; import java.util.Map; import org.hibernate.Session; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/Child.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Child.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/Child.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Child.java index 02cfa6f92d..0ee560dacb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/Child.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/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.envers.test.integration.collection.norevision; +package org.hibernate.orm.test.envers.integration.collection.norevision; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/CollectionChangeNoRevisionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/CollectionChangeNoRevisionTest.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/CollectionChangeNoRevisionTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/CollectionChangeNoRevisionTest.java index 20a623ccf3..665898fee3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/CollectionChangeNoRevisionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/CollectionChangeNoRevisionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection.norevision; +package org.hibernate.orm.test.envers.integration.collection.norevision; import java.util.Arrays; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/CollectionChangeRevisionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/CollectionChangeRevisionTest.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/CollectionChangeRevisionTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/CollectionChangeRevisionTest.java index c5b0643541..9a7c673b60 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/CollectionChangeRevisionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/CollectionChangeRevisionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection.norevision; +package org.hibernate.orm.test.envers.integration.collection.norevision; import java.util.Arrays; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/House.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/House.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/House.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/House.java index 87162125c8..0dfe0872fa 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/House.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/House.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.collection.norevision; +package org.hibernate.orm.test.envers.integration.collection.norevision; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/Name.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Name.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/Name.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Name.java index e80f55f4c0..4abffce9d9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/Name.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/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.envers.test.integration.collection.norevision; +package org.hibernate.orm.test.envers.integration.collection.norevision; import java.io.Serializable; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/Parent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Parent.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/Parent.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Parent.java index 033a436e13..b35e541a63 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/Parent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/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.envers.test.integration.collection.norevision; +package org.hibernate.orm.test.envers.integration.collection.norevision; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Person.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/Person.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/Person.java index 00d239652e..aec2023280 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/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.envers.test.integration.collection.norevision; +package org.hibernate.orm.test.envers.integration.collection.norevision; import java.io.Serializable; import java.util.HashSet; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/Components.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/Components.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/Components.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/Components.java index 46e72c46b7..f36a6fb341 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/Components.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/Components.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components; +package org.hibernate.orm.test.envers.integration.components; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.components.Component1; -import org.hibernate.envers.test.entities.components.Component2; -import org.hibernate.envers.test.entities.components.ComponentTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.components.Component1; +import org.hibernate.orm.test.envers.entities.components.Component2; +import org.hibernate.orm.test.envers.entities.components.ComponentTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/DefaultValueComponents.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/DefaultValueComponents.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/DefaultValueComponents.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/DefaultValueComponents.java index 892165a41a..a7cf12ea67 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/DefaultValueComponents.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/DefaultValueComponents.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components; +package org.hibernate.orm.test.envers.integration.components; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.components.DefaultValueComponent1; -import org.hibernate.envers.test.entities.components.DefaultValueComponent2; -import org.hibernate.envers.test.entities.components.DefaultValueComponentTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.components.DefaultValueComponent1; +import org.hibernate.orm.test.envers.entities.components.DefaultValueComponent2; +import org.hibernate.orm.test.envers.entities.components.DefaultValueComponentTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/PropertiesGroupTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/PropertiesGroupTest.java similarity index 84% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/PropertiesGroupTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/PropertiesGroupTest.java index a701186436..0cd550ba5d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/PropertiesGroupTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/PropertiesGroupTest.java @@ -4,13 +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.envers.test.integration.components; +package org.hibernate.orm.test.envers.integration.components; import org.hibernate.Session; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.components.UniquePropsEntity; -import org.hibernate.envers.test.entities.components.UniquePropsNotAuditedEntity; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.components.UniquePropsEntity; +import org.hibernate.orm.test.envers.entities.components.UniquePropsNotAuditedEntity; import org.hibernate.mapping.Column; import org.hibernate.mapping.PersistentClass; @@ -40,10 +40,10 @@ public class PropertiesGroupTest extends BaseEnversFunctionalTestCase { @Priority(10) public void initData() { uniquePropsAudit = metadata().getEntityBinding( - "org.hibernate.envers.test.entities.components.UniquePropsEntity_AUD" + "org.hibernate.orm.test.envers.entities.components.UniquePropsEntity_AUD" ); uniquePropsNotAuditedAudit = metadata().getEntityBinding( - "org.hibernate.envers.test.entities.components.UniquePropsNotAuditedEntity_AUD" + "org.hibernate.orm.test.envers.entities.components.UniquePropsNotAuditedEntity_AUD" ); // Revision 1 diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/CollectionOfComponents.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/CollectionOfComponents.java similarity index 87% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/CollectionOfComponents.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/CollectionOfComponents.java index 5a92dc3c46..5f3151ac3e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/CollectionOfComponents.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/CollectionOfComponents.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.envers.test.integration.components.collections; +package org.hibernate.orm.test.envers.integration.components.collections; import java.util.Arrays; import java.util.Collections; import java.util.Set; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.components.Component1; -import org.hibernate.envers.test.entities.components.ComponentSetTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.components.Component1; +import org.hibernate.orm.test.envers.entities.components.ComponentSetTestEntity; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/mappedsuperclasselement/AbstractCode.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/AbstractCode.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/mappedsuperclasselement/AbstractCode.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/AbstractCode.java index 7f0aa912d3..06535edb07 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/mappedsuperclasselement/AbstractCode.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/AbstractCode.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.collections.mappedsuperclasselement; +package org.hibernate.orm.test.envers.integration.components.collections.mappedsuperclasselement; import javax.persistence.Access; import javax.persistence.AccessType; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/mappedsuperclasselement/Code.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/Code.java similarity index 81% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/mappedsuperclasselement/Code.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/Code.java index 6fbf1231ab..1af5c90485 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/mappedsuperclasselement/Code.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/Code.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.collections.mappedsuperclasselement; +package org.hibernate.orm.test.envers.integration.components.collections.mappedsuperclasselement; import javax.persistence.Embeddable; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/mappedsuperclasselement/CollectionOfMappedSuperclassComponentsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/CollectionOfMappedSuperclassComponentsTest.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/mappedsuperclasselement/CollectionOfMappedSuperclassComponentsTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/CollectionOfMappedSuperclassComponentsTest.java index d66744ac25..8d77eb5f5f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/mappedsuperclasselement/CollectionOfMappedSuperclassComponentsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/CollectionOfMappedSuperclassComponentsTest.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.envers.test.integration.components.collections.mappedsuperclasselement; +package org.hibernate.orm.test.envers.integration.components.collections.mappedsuperclasselement; import java.util.Arrays; import java.util.Set; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.FailureExpected; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/mappedsuperclasselement/MappedSuperclassComponentSetTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/MappedSuperclassComponentSetTestEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/mappedsuperclasselement/MappedSuperclassComponentSetTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/MappedSuperclassComponentSetTestEntity.java index a9a0286119..8402861944 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/mappedsuperclasselement/MappedSuperclassComponentSetTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/collections/mappedsuperclasselement/MappedSuperclassComponentSetTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.collections.mappedsuperclasselement; +package org.hibernate.orm.test.envers.integration.components.collections.mappedsuperclasselement; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/AdvancedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AdvancedEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/AdvancedEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AdvancedEntity.java index 7edb003a42..e4aed4a6c2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/AdvancedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AdvancedEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.dynamic; +package org.hibernate.orm.test.envers.integration.components.dynamic; import java.util.HashMap; import java.util.Map; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/Age.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/Age.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/Age.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/Age.java index 7dff32538c..fd298606af 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/Age.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/Age.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.dynamic; +package org.hibernate.orm.test.envers.integration.components.dynamic; public class Age { diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/AgeType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AgeType.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/AgeType.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AgeType.java index 3871c535bf..9155f38c7e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/AgeType.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AgeType.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.dynamic; +package org.hibernate.orm.test.envers.integration.components.dynamic; import java.io.Serializable; import java.sql.PreparedStatement; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/AuditedDynamicComponentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AuditedDynamicComponentEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/AuditedDynamicComponentEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AuditedDynamicComponentEntity.java index a269072bda..339ef5b240 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/AuditedDynamicComponentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AuditedDynamicComponentEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.dynamic; +package org.hibernate.orm.test.envers.integration.components.dynamic; import java.io.Serializable; import java.util.HashMap; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/InternalComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/InternalComponent.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/InternalComponent.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/InternalComponent.java index 0cdad2f670..b08400e8fc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/InternalComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/InternalComponent.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.dynamic; +package org.hibernate.orm.test.envers.integration.components.dynamic; public class InternalComponent { diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/ManyToManyEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/ManyToManyEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/ManyToManyEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/ManyToManyEntity.java index 197b586482..8d4213ded6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/ManyToManyEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/ManyToManyEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.dynamic; +package org.hibernate.orm.test.envers.integration.components.dynamic; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/ManyToOneEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/ManyToOneEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/ManyToOneEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/ManyToOneEntity.java index f76dbf3bf3..17b9342102 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/ManyToOneEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/ManyToOneEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.dynamic; +package org.hibernate.orm.test.envers.integration.components.dynamic; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/NotAuditedDynamicComponentTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/NotAuditedDynamicComponentTest.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/NotAuditedDynamicComponentTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/NotAuditedDynamicComponentTest.java index 5f64fe4258..eaa82ab9a1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/NotAuditedDynamicComponentTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/NotAuditedDynamicComponentTest.java @@ -4,13 +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.envers.test.integration.components.dynamic; +package org.hibernate.orm.test.envers.integration.components.dynamic; import java.util.Arrays; import org.hibernate.Session; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/NotAuditedDynamicMapComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/NotAuditedDynamicMapComponent.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/NotAuditedDynamicMapComponent.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/NotAuditedDynamicMapComponent.java index dc620ad8f2..9b46593d93 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/NotAuditedDynamicMapComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/NotAuditedDynamicMapComponent.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.dynamic; +package org.hibernate.orm.test.envers.integration.components.dynamic; import java.io.Serializable; import java.util.HashMap; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/OneToOneEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/OneToOneEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/OneToOneEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/OneToOneEntity.java index 66e64234a5..87b06a70e0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/OneToOneEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/OneToOneEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.dynamic; +package org.hibernate.orm.test.envers.integration.components.dynamic; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/PlainComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/PlainComponent.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/PlainComponent.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/PlainComponent.java index 987d6219b8..1c4e16b57e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/PlainComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/PlainComponent.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.dynamic; +package org.hibernate.orm.test.envers.integration.components.dynamic; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/PlainEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/PlainEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/PlainEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/PlainEntity.java index 1356a664c7..512a13f342 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/PlainEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/PlainEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.dynamic; +package org.hibernate.orm.test.envers.integration.components.dynamic; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/SanityCheckTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/SanityCheckTest.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/SanityCheckTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/SanityCheckTest.java index d7fb5c9801..7cb29da896 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/SanityCheckTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/SanityCheckTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.dynamic; +package org.hibernate.orm.test.envers.integration.components.dynamic; import java.util.ArrayList; import java.util.List; @@ -13,8 +13,8 @@ import junit.framework.Assert; import org.hibernate.Session; import org.hibernate.envers.exception.AuditException; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping; @@ -148,7 +148,7 @@ public class SanityCheckTest extends BaseEnversFunctionalTestCase { catch ( Exception e ) { assertTyping( AuditException.class, e ); assertEquals( - "This type of relation (org.hibernate.envers.test.integration.components.dynamic.PlainEntity.component_manyToManyList) isn't supported and can't be used in queries.", + "This type of relation (org.hibernate.orm.test.envers.integration.components.dynamic.PlainEntity.component_manyToManyList) isn't supported and can't be used in queries.", e.getMessage() ); } diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/SimpleEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/SimpleEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/SimpleEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/SimpleEntity.java index f44b709945..299dd22dfd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/dynamic/SimpleEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/SimpleEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.dynamic; +package org.hibernate.orm.test.envers.integration.components.dynamic; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/AbstractEmbeddable.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AbstractEmbeddable.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/AbstractEmbeddable.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AbstractEmbeddable.java index 7489d1add7..e75c47a4ed 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/AbstractEmbeddable.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/AbstractEmbeddable.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.mappedsuperclass; +package org.hibernate.orm.test.envers.integration.components.mappedsuperclass; import javax.persistence.Access; import javax.persistence.AccessType; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EmbeddableWithDeclaredData.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredData.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EmbeddableWithDeclaredData.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredData.java index 5781f9347c..8110ed402b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EmbeddableWithDeclaredData.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredData.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.mappedsuperclass; +package org.hibernate.orm.test.envers.integration.components.mappedsuperclass; /** * @author Jakob Braeuchi. diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java index 976d398f9b..645fdd7374 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithDeclaredDataTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.mappedsuperclass; +package org.hibernate.orm.test.envers.integration.components.mappedsuperclass; import java.util.List; import javax.persistence.EntityManager; @@ -12,8 +12,8 @@ import javax.persistence.EntityTransaction; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.FailureExpected; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredData.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredData.java similarity index 87% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredData.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredData.java index c0c3a4bf17..614c490c2d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredData.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredData.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.mappedsuperclass; +package org.hibernate.orm.test.envers.integration.components.mappedsuperclass; import javax.persistence.Embeddable; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java index 9123f0cf94..00a970be6e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EmbeddableWithNoDeclaredDataTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.mappedsuperclass; +package org.hibernate.orm.test.envers.integration.components.mappedsuperclass; import java.util.List; import javax.persistence.EntityManager; @@ -12,8 +12,8 @@ import javax.persistence.EntityTransaction; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EntityWithEmbeddableWithDeclaredData.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithDeclaredData.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EntityWithEmbeddableWithDeclaredData.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithDeclaredData.java index ad788609f7..3ba76699ed 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EntityWithEmbeddableWithDeclaredData.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithDeclaredData.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.mappedsuperclass; +package org.hibernate.orm.test.envers.integration.components.mappedsuperclass; import javax.persistence.Access; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EntityWithEmbeddableWithNoDeclaredData.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithNoDeclaredData.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EntityWithEmbeddableWithNoDeclaredData.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithNoDeclaredData.java index 521627477e..5c20aacacf 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EntityWithEmbeddableWithNoDeclaredData.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/mappedsuperclass/EntityWithEmbeddableWithNoDeclaredData.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.mappedsuperclass; +package org.hibernate.orm.test.envers.integration.components.mappedsuperclass; import javax.persistence.Access; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/ManyToOneInComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/ManyToOneInComponent.java similarity index 85% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/ManyToOneInComponent.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/ManyToOneInComponent.java index 1a30a279e2..029e6c49b3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/ManyToOneInComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/ManyToOneInComponent.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.relations; +package org.hibernate.orm.test.envers.integration.components.relations; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.components.relations.ManyToOneComponent; -import org.hibernate.envers.test.entities.components.relations.ManyToOneComponentTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.components.relations.ManyToOneComponent; +import org.hibernate.orm.test.envers.entities.components.relations.ManyToOneComponentTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/NotAuditedManyToOneInComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/NotAuditedManyToOneInComponent.java similarity index 85% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/NotAuditedManyToOneInComponent.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/NotAuditedManyToOneInComponent.java index 17d057be95..8e067cb22d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/NotAuditedManyToOneInComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/NotAuditedManyToOneInComponent.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.relations; +package org.hibernate.orm.test.envers.integration.components.relations; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.UnversionedStrTestEntity; -import org.hibernate.envers.test.entities.components.relations.NotAuditedManyToOneComponent; -import org.hibernate.envers.test.entities.components.relations.NotAuditedManyToOneComponentTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity; +import org.hibernate.orm.test.envers.entities.components.relations.NotAuditedManyToOneComponent; +import org.hibernate.orm.test.envers.entities.components.relations.NotAuditedManyToOneComponentTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/OneToManyInComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/OneToManyInComponent.java similarity index 86% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/OneToManyInComponent.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/OneToManyInComponent.java index dc0c90f460..1baa6b7b79 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/OneToManyInComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/relations/OneToManyInComponent.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.components.relations; +package org.hibernate.orm.test.envers.integration.components.relations; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.components.relations.OneToManyComponent; -import org.hibernate.envers.test.entities.components.relations.OneToManyComponentTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.components.relations.OneToManyComponent; +import org.hibernate.orm.test.envers.entities.components.relations.OneToManyComponentTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/dynamicmodel/DynamicModelTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/dynamicmodel/DynamicModelTest.java similarity index 87% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/dynamicmodel/DynamicModelTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/dynamicmodel/DynamicModelTest.java index 38aede339e..8fb0fc3ee3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/dynamicmodel/DynamicModelTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/dynamicmodel/DynamicModelTest.java @@ -4,9 +4,9 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.dynamicmodel; +package org.hibernate.orm.test.envers.integration.dynamicmodel; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/auditedEntity/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/auditedEntity/Person.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/auditedEntity/Person.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/auditedEntity/Person.java index 0fd2659866..be0fcf9e5d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/auditedEntity/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/auditedEntity/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.envers.test.integration.entityNames.auditedEntity; +package org.hibernate.orm.test.envers.integration.entityNames.auditedEntity; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/auditedEntity/ReadEntityWhitEntityNameTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/auditedEntity/ReadEntityWhitEntityNameTest.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/auditedEntity/ReadEntityWhitEntityNameTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/auditedEntity/ReadEntityWhitEntityNameTest.java index a5a0c6da8d..08d4a788fa 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/auditedEntity/ReadEntityWhitEntityNameTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/auditedEntity/ReadEntityWhitEntityNameTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.entityNames.auditedEntity; +package org.hibernate.orm.test.envers.integration.entityNames.auditedEntity; import java.io.File; import java.net.URISyntaxException; @@ -12,8 +12,8 @@ import java.net.URL; import java.util.List; import org.hibernate.MappingException; -import org.hibernate.envers.test.AbstractOneSessionTest; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.AbstractOneSessionTest; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/Car.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/Car.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/Car.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/Car.java index 4b20913b1e..2e6d25435c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/Car.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/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.envers.test.integration.entityNames.manyToManyAudited; +package org.hibernate.orm.test.envers.integration.entityNames.manyToManyAudited; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/Person.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/Person.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/Person.java index f9a60dc98b..eba1266035 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/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.envers.test.integration.entityNames.manyToManyAudited; +package org.hibernate.orm.test.envers.integration.entityNames.manyToManyAudited; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/ReadEntityWithAuditedManyToManyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/ReadEntityWithAuditedManyToManyTest.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/ReadEntityWithAuditedManyToManyTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/ReadEntityWithAuditedManyToManyTest.java index 386e47d3af..5a79867ffe 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/ReadEntityWithAuditedManyToManyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/manyToManyAudited/ReadEntityWithAuditedManyToManyTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.entityNames.manyToManyAudited; +package org.hibernate.orm.test.envers.integration.entityNames.manyToManyAudited; import java.io.File; import java.net.URISyntaxException; @@ -13,8 +13,8 @@ import java.util.ArrayList; import java.util.List; import org.hibernate.MappingException; -import org.hibernate.envers.test.AbstractOneSessionTest; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.AbstractOneSessionTest; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/Car.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/Car.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/Car.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/Car.java index c16b171cc3..2906720b3f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/Car.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/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.envers.test.integration.entityNames.oneToManyAudited; +package org.hibernate.orm.test.envers.integration.entityNames.oneToManyAudited; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/Person.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/Person.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/Person.java index 94d0f5dc82..aadc327d40 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/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.envers.test.integration.entityNames.oneToManyAudited; +package org.hibernate.orm.test.envers.integration.entityNames.oneToManyAudited; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/ReadEntityWithAuditedCollectionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/ReadEntityWithAuditedCollectionTest.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/ReadEntityWithAuditedCollectionTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/ReadEntityWithAuditedCollectionTest.java index 616d156d85..c6af09c1ee 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/ReadEntityWithAuditedCollectionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyAudited/ReadEntityWithAuditedCollectionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.entityNames.oneToManyAudited; +package org.hibernate.orm.test.envers.integration.entityNames.oneToManyAudited; import java.io.File; import java.net.URISyntaxException; @@ -13,8 +13,8 @@ import java.util.ArrayList; import java.util.List; import org.hibernate.MappingException; -import org.hibernate.envers.test.AbstractOneSessionTest; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.AbstractOneSessionTest; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/Car.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/Car.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/Car.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/Car.java index 97a19f4c17..586a568c55 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/Car.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/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.envers.test.integration.entityNames.oneToManyNotAudited; +package org.hibernate.orm.test.envers.integration.entityNames.oneToManyNotAudited; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/Person.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/Person.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/Person.java index ab93b4dbd5..e34af096be 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/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.envers.test.integration.entityNames.oneToManyNotAudited; +package org.hibernate.orm.test.envers.integration.entityNames.oneToManyNotAudited; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/ReadEntityWithAuditedCollectionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/ReadEntityWithAuditedCollectionTest.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/ReadEntityWithAuditedCollectionTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/ReadEntityWithAuditedCollectionTest.java index 4d5334e974..6eb3475bc4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/ReadEntityWithAuditedCollectionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/oneToManyNotAudited/ReadEntityWithAuditedCollectionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.entityNames.oneToManyNotAudited; +package org.hibernate.orm.test.envers.integration.entityNames.oneToManyNotAudited; import java.io.File; import java.net.URISyntaxException; @@ -13,8 +13,8 @@ import java.util.ArrayList; import java.util.List; import org.hibernate.MappingException; -import org.hibernate.envers.test.AbstractOneSessionTest; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.AbstractOneSessionTest; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/Car.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/Car.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/Car.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/Car.java index 8d7b45f310..52c48f2092 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/Car.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/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.envers.test.integration.entityNames.singleAssociatedAudited; +package org.hibernate.orm.test.envers.integration.entityNames.singleAssociatedAudited; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/Person.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/Person.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/Person.java index 0f4b4e9182..18fac3e00c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/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.envers.test.integration.entityNames.singleAssociatedAudited; +package org.hibernate.orm.test.envers.integration.entityNames.singleAssociatedAudited; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/ReadEntityAssociatedAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/ReadEntityAssociatedAuditedTest.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/ReadEntityAssociatedAuditedTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/ReadEntityAssociatedAuditedTest.java index ad622b122c..1e28e0132d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/ReadEntityAssociatedAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/ReadEntityAssociatedAuditedTest.java @@ -4,15 +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.envers.test.integration.entityNames.singleAssociatedAudited; +package org.hibernate.orm.test.envers.integration.entityNames.singleAssociatedAudited; import java.io.File; import java.net.URISyntaxException; import java.net.URL; import org.hibernate.MappingException; -import org.hibernate.envers.test.AbstractOneSessionTest; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.AbstractOneSessionTest; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java index 670801d785..894850f821 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java @@ -4,15 +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.envers.test.integration.entityNames.singleAssociatedAudited; +package org.hibernate.orm.test.envers.integration.entityNames.singleAssociatedAudited; import java.io.File; import java.net.URISyntaxException; import java.net.URL; import org.hibernate.MappingException; -import org.hibernate.envers.test.AbstractOneSessionTest; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.AbstractOneSessionTest; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/Car.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/Car.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/Car.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/Car.java index 48fb5e184f..8518d78571 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/Car.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/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.envers.test.integration.entityNames.singleAssociatedNotAudited; +package org.hibernate.orm.test.envers.integration.entityNames.singleAssociatedNotAudited; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/Person.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/Person.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/Person.java index 5599688202..eec0313bfc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/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.envers.test.integration.entityNames.singleAssociatedNotAudited; +package org.hibernate.orm.test.envers.integration.entityNames.singleAssociatedNotAudited; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/ReadEntityAssociatedNotAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/ReadEntityAssociatedNotAuditedTest.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/ReadEntityAssociatedNotAuditedTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/ReadEntityAssociatedNotAuditedTest.java index ee3b859e95..3988534908 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/ReadEntityAssociatedNotAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/entityNames/singleAssociatedNotAudited/ReadEntityAssociatedNotAuditedTest.java @@ -4,15 +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.envers.test.integration.entityNames.singleAssociatedNotAudited; +package org.hibernate.orm.test.envers.integration.entityNames.singleAssociatedNotAudited; import java.io.File; import java.net.URISyntaxException; import java.net.URL; import org.hibernate.MappingException; -import org.hibernate.envers.test.AbstractOneSessionTest; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.AbstractOneSessionTest; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/AbstractFlushTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/AbstractFlushTest.java similarity index 87% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/AbstractFlushTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/AbstractFlushTest.java index c7e8b54432..8dc5b9cebc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/AbstractFlushTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/AbstractFlushTest.java @@ -4,15 +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.envers.test.integration.flush; +package org.hibernate.orm.test.envers.integration.flush; import java.io.IOException; import javax.persistence.EntityManager; import org.hibernate.FlushMode; import org.hibernate.Session; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.junit.Before; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/CommitFlush.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlush.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/CommitFlush.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlush.java index f5f594cade..26c124c005 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/CommitFlush.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlush.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.flush; +package org.hibernate.orm.test.envers.integration.flush; import java.util.Arrays; import java.util.List; @@ -13,8 +13,8 @@ import javax.persistence.EntityManager; import org.hibernate.FlushMode; import org.hibernate.envers.RevisionType; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/CommitFlushCollectionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushCollectionTest.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/CommitFlushCollectionTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushCollectionTest.java index ff310a7f6e..5f9156f1f9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/CommitFlushCollectionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushCollectionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.flush; +package org.hibernate.orm.test.envers.integration.flush; import static org.junit.Assert.assertEquals; @@ -29,8 +29,8 @@ import javax.persistence.Version; import org.hibernate.envers.AuditMappedBy; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/CommitFlushSingleRevisionInTransaction.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushSingleRevisionInTransaction.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/CommitFlushSingleRevisionInTransaction.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushSingleRevisionInTransaction.java index 43e6aef612..9343c80d47 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/CommitFlushSingleRevisionInTransaction.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/CommitFlushSingleRevisionInTransaction.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.flush; +package org.hibernate.orm.test.envers.integration.flush; import static org.junit.Assert.assertEquals; @@ -13,7 +13,7 @@ import javax.persistence.EntityManager; import org.hibernate.FlushMode; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddDel.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddDel.java similarity index 87% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddDel.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddDel.java index 97a2232a34..8fb3dedf89 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddDel.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddDel.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.envers.test.integration.flush; +package org.hibernate.orm.test.envers.integration.flush; import java.util.Arrays; import javax.persistence.EntityManager; import org.hibernate.FlushMode; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddMod.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddMod.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddMod.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddMod.java index 5cce9da605..99bc63cf8a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddMod.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushAddMod.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.flush; +package org.hibernate.orm.test.envers.integration.flush; import java.util.Arrays; import java.util.List; @@ -13,8 +13,8 @@ import javax.persistence.EntityManager; import org.hibernate.FlushMode; import org.hibernate.envers.RevisionType; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushModDel.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModDel.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushModDel.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModDel.java index 37de60e0bf..5f68adae98 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushModDel.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModDel.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.flush; +package org.hibernate.orm.test.envers.integration.flush; import java.util.Arrays; import java.util.List; @@ -13,8 +13,8 @@ import javax.persistence.EntityManager; import org.hibernate.FlushMode; import org.hibernate.envers.RevisionType; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushModMod.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModMod.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushModMod.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModMod.java index 379b7c24f9..ef881ecfa7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushModMod.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/DoubleFlushModMod.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.flush; +package org.hibernate.orm.test.envers.integration.flush; import java.util.Arrays; import java.util.List; @@ -13,8 +13,8 @@ import javax.persistence.EntityManager; import org.hibernate.FlushMode; import org.hibernate.envers.RevisionType; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/ManualFlush.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlush.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/ManualFlush.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlush.java index a4b71cfafb..268d57b7f0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/ManualFlush.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlush.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.flush; +package org.hibernate.orm.test.envers.integration.flush; import java.util.Arrays; import java.util.List; @@ -13,8 +13,8 @@ import javax.persistence.EntityManager; import org.hibernate.FlushMode; import org.hibernate.envers.RevisionType; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/ManualFlushAutoCommitDisabled.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlushAutoCommitDisabled.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/ManualFlushAutoCommitDisabled.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlushAutoCommitDisabled.java index 122414a0ab..10ded5e55f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/ManualFlushAutoCommitDisabled.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/flush/ManualFlushAutoCommitDisabled.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.flush; +package org.hibernate.orm.test.envers.integration.flush; import java.util.Map; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/ChangingHashcode.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ChangingHashcode.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/ChangingHashcode.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ChangingHashcode.java index ec5d6615b9..7741a44aba 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/ChangingHashcode.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ChangingHashcode.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.envers.test.integration.hashcode; +package org.hibernate.orm.test.envers.integration.hashcode; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/ComponentCollectionHashcodeChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ComponentCollectionHashcodeChangeTest.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/ComponentCollectionHashcodeChangeTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ComponentCollectionHashcodeChangeTest.java index 36bf1e5591..aa862e8721 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/ComponentCollectionHashcodeChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ComponentCollectionHashcodeChangeTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.hashcode; +package org.hibernate.orm.test.envers.integration.hashcode; import java.util.Arrays; import java.util.HashSet; @@ -18,9 +18,9 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/ListHashcodeChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ListHashcodeChangeTest.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/ListHashcodeChangeTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ListHashcodeChangeTest.java index ba191e3c7a..c60ca1f647 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/ListHashcodeChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/ListHashcodeChangeTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.hashcode; +package org.hibernate.orm.test.envers.integration.hashcode; import java.util.ArrayList; import java.util.Iterator; @@ -12,7 +12,6 @@ import java.util.List; import java.util.Objects; import javax.persistence.CascadeType; -import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.EntityManager; import javax.persistence.FetchType; @@ -26,8 +25,8 @@ import javax.persistence.OneToMany; import org.hibernate.envers.AuditReader; import org.hibernate.envers.Audited; import org.hibernate.envers.NotAudited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/SetHashcodeChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/SetHashcodeChangeTest.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/SetHashcodeChangeTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/SetHashcodeChangeTest.java index 9f10c51194..cd16a373e2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/SetHashcodeChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/SetHashcodeChangeTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.hashcode; +package org.hibernate.orm.test.envers.integration.hashcode; import java.util.HashSet; import java.util.Iterator; @@ -26,8 +26,8 @@ import javax.persistence.OneToMany; import org.hibernate.envers.AuditReader; import org.hibernate.envers.Audited; import org.hibernate.envers.NotAudited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/WikiImage.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiImage.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/WikiImage.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiImage.java index 1cfb23b2e5..cadd8cce06 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/WikiImage.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiImage.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.hashcode; +package org.hibernate.orm.test.envers.integration.hashcode; import javax.persistence.Basic; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/WikiPage.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiPage.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/WikiPage.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiPage.java index 1a59e51dd1..9be675b219 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/WikiPage.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/hashcode/WikiPage.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.hashcode; +package org.hibernate.orm.test.envers.integration.hashcode; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/CompositeDateId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeDateId.java similarity index 84% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/CompositeDateId.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeDateId.java index 98e2b0afa5..f95c6ed657 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/CompositeDateId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/CompositeDateId.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.ids; +package org.hibernate.orm.test.envers.integration.ids; import java.util.Arrays; import java.util.Date; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.ids.CompositeDateIdTestEntity; -import org.hibernate.envers.test.entities.ids.DateEmbId; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.ids.CompositeDateIdTestEntity; +import org.hibernate.orm.test.envers.entities.ids.DateEmbId; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/DateId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/DateId.java similarity index 86% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/DateId.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/DateId.java index bc0a0fee26..b4caf8857d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/DateId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/DateId.java @@ -4,15 +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.envers.test.integration.ids; +package org.hibernate.orm.test.envers.integration.ids; import java.util.Arrays; import java.util.Date; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.ids.DateIdTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.ids.DateIdTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/ManyToOneIdNotAudited.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/ManyToOneIdNotAudited.java similarity index 75% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/ManyToOneIdNotAudited.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/ManyToOneIdNotAudited.java index ce81efb2e7..f35234b207 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/ManyToOneIdNotAudited.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/ManyToOneIdNotAudited.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.ids; +package org.hibernate.orm.test.envers.integration.ids; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.UnversionedStrTestEntity; -import org.hibernate.envers.test.entities.ids.ManyToOneIdNotAuditedTestEntity; -import org.hibernate.envers.test.entities.ids.ManyToOneNotAuditedEmbId; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity; +import org.hibernate.orm.test.envers.entities.ids.ManyToOneIdNotAuditedTestEntity; +import org.hibernate.orm.test.envers.entities.ids.ManyToOneNotAuditedEmbId; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/CorrectChild.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChild.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/CorrectChild.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChild.java index 1ecf2ae164..640c1d3448 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/CorrectChild.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChild.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.ids.embeddedid; +package org.hibernate.orm.test.envers.integration.ids.embeddedid; import javax.persistence.EmbeddedId; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/CorrectChildId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChildId.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/CorrectChildId.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChildId.java index 1855c48051..f6c4f0723c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/CorrectChildId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/CorrectChildId.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.ids.embeddedid; +package org.hibernate.orm.test.envers.integration.ids.embeddedid; import java.io.Serializable; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/IncorrectChild.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChild.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/IncorrectChild.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChild.java index 60ee0793b1..58cabf3de0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/IncorrectChild.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChild.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.ids.embeddedid; +package org.hibernate.orm.test.envers.integration.ids.embeddedid; import javax.persistence.EmbeddedId; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/IncorrectChildId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChildId.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/IncorrectChildId.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChildId.java index f2886a2809..1bee7fe636 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/IncorrectChildId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/IncorrectChildId.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.ids.embeddedid; +package org.hibernate.orm.test.envers.integration.ids.embeddedid; import java.io.Serializable; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/Item.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Item.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/Item.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Item.java index 3dea2833a6..5bd5e0d335 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/Item.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/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.envers.test.integration.ids.embeddedid; +package org.hibernate.orm.test.envers.integration.ids.embeddedid; import java.io.Serializable; import javax.persistence.EmbeddedId; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/ItemId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/ItemId.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/ItemId.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/ItemId.java index f25a9da6e4..df2bd2b32d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/ItemId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/ItemId.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.ids.embeddedid; +package org.hibernate.orm.test.envers.integration.ids.embeddedid; import java.io.Serializable; import javax.persistence.Column; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/Parent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Parent.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/Parent.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Parent.java index 21127cd09a..bcb3d0c877 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/Parent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/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.envers.test.integration.ids.embeddedid; +package org.hibernate.orm.test.envers.integration.ids.embeddedid; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/Producer.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Producer.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/Producer.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Producer.java index 63d29f3a1f..d1c333cbf9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/Producer.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/Producer.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.ids.embeddedid; +package org.hibernate.orm.test.envers.integration.ids.embeddedid; import java.io.Serializable; import javax.persistence.Column; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/PurchaseOrder.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/PurchaseOrder.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/PurchaseOrder.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/PurchaseOrder.java index aec442c91b..849193880f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/PurchaseOrder.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/PurchaseOrder.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.ids.embeddedid; +package org.hibernate.orm.test.envers.integration.ids.embeddedid; import java.io.Serializable; import javax.persistence.Column; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableRemoveTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableRemoveTest.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableRemoveTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableRemoveTest.java index 5071bd2de6..a08cc525fc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableRemoveTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/embeddedid/RelationInsideEmbeddableRemoveTest.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.envers.test.integration.ids.embeddedid; +package org.hibernate.orm.test.envers.integration.ids.embeddedid; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/ClassType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ClassType.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/ClassType.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ClassType.java index c133ab1ee2..c9e3cde79c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/ClassType.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ClassType.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.ids.idclass; +package org.hibernate.orm.test.envers.integration.ids.idclass; import java.io.Serializable; import javax.persistence.Column; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/IdClassReferenceIdentifierTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassReferenceIdentifierTest.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/IdClassReferenceIdentifierTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassReferenceIdentifierTest.java index 4ca8807f60..0ed89b243f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/IdClassReferenceIdentifierTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IdClassReferenceIdentifierTest.java @@ -4,11 +4,11 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.ids.idclass; +package org.hibernate.orm.test.envers.integration.ids.idclass; import junit.framework.Assert; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/IntegerGeneratedIdentityEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IntegerGeneratedIdentityEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/IntegerGeneratedIdentityEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IntegerGeneratedIdentityEntity.java index 71226babfa..cb282c6fba 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/IntegerGeneratedIdentityEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/IntegerGeneratedIdentityEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.ids.idclass; +package org.hibernate.orm.test.envers.integration.ids.idclass; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/ReferenceIdentifierClassId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ReferenceIdentifierClassId.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/ReferenceIdentifierClassId.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ReferenceIdentifierClassId.java index 433187e6ee..1b3f35b9bb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/ReferenceIdentifierClassId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ReferenceIdentifierClassId.java @@ -1,4 +1,4 @@ -package org.hibernate.envers.test.integration.ids.idclass; +package org.hibernate.orm.test.envers.integration.ids.idclass; import java.io.Serializable; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/ReferenceIdentifierEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ReferenceIdentifierEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/ReferenceIdentifierEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ReferenceIdentifierEntity.java index f0c39efa9a..b715f380ff 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/ReferenceIdentifierEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/ReferenceIdentifierEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.ids.idclass; +package org.hibernate.orm.test.envers.integration.ids.idclass; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/RelationalClassId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/RelationalClassId.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/RelationalClassId.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/RelationalClassId.java index 49dd9f3231..87d59aa526 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/RelationalClassId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/RelationalClassId.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.ids.idclass; +package org.hibernate.orm.test.envers.integration.ids.idclass; import java.io.Serializable; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/SampleClass.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/SampleClass.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/SampleClass.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/SampleClass.java index 61c4f85939..9c9c0ae10a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/SampleClass.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/idclass/SampleClass.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.ids.idclass; +package org.hibernate.orm.test.envers.integration.ids.idclass; import java.io.Serializable; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/protectedmodifier/ProtectedConstructorEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/protectedmodifier/ProtectedConstructorEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorEntity.java index c4a6c15dd2..0c46f36d53 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/protectedmodifier/ProtectedConstructorEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.ids.protectedmodifier; +package org.hibernate.orm.test.envers.integration.ids.protectedmodifier; import java.io.Serializable; import javax.persistence.EmbeddedId; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/protectedmodifier/ProtectedConstructorTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorTest.java similarity index 87% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/protectedmodifier/ProtectedConstructorTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorTest.java index 1728f82fac..7333cf5c81 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/protectedmodifier/ProtectedConstructorTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/ProtectedConstructorTest.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.envers.test.integration.ids.protectedmodifier; +package org.hibernate.orm.test.envers.integration.ids.protectedmodifier; import java.util.Arrays; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/protectedmodifier/WrappedStringId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/WrappedStringId.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/protectedmodifier/WrappedStringId.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/WrappedStringId.java index 2e6d390b9e..3ae5d41aef 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/protectedmodifier/WrappedStringId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/ids/protectedmodifier/WrappedStringId.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.ids.protectedmodifier; +package org.hibernate.orm.test.envers.integration.ids.protectedmodifier; import java.io.Serializable; import javax.persistence.Embeddable; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildAuditing.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ChildAuditing.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildAuditing.java index 5fd0104264..8162e4492e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ChildAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildAuditing.java @@ -4,13 +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.envers.test.integration.inheritance.single; +package org.hibernate.orm.test.envers.integration.inheritance.single; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ChildEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildEntity.java index 79d266aa80..c0e4dec35e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ChildEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ChildEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.single; +package org.hibernate.orm.test.envers.integration.inheritance.single; import javax.persistence.Basic; import javax.persistence.DiscriminatorValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ParentAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentAuditing.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ParentAuditing.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentAuditing.java index e9dfbaa21d..58a7b55d6f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ParentAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentAuditing.java @@ -4,13 +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.envers.test.integration.inheritance.single; +package org.hibernate.orm.test.envers.integration.inheritance.single; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ParentEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentEntity.java index 9126d3760c..57c3b45ca9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ParentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/ParentEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.single; +package org.hibernate.orm.test.envers.integration.inheritance.single; import javax.persistence.Basic; import javax.persistence.DiscriminatorColumn; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildIngEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildIngEntity.java index eebba380ed..52571521b6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildIngEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.single.childrelation; +package org.hibernate.orm.test.envers.integration.inheritance.single.childrelation; import javax.persistence.Basic; import javax.persistence.DiscriminatorValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildReferencing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildReferencing.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildReferencing.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildReferencing.java index ec567ddca3..4fe4114289 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildReferencing.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ChildReferencing.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.envers.test.integration.inheritance.single.childrelation; +package org.hibernate.orm.test.envers.integration.inheritance.single.childrelation; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ParentNotIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ParentNotIngEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ParentNotIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ParentNotIngEntity.java index a8b93d35a1..3842b2b272 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ParentNotIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ParentNotIngEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.single.childrelation; +package org.hibernate.orm.test.envers.integration.inheritance.single.childrelation; import javax.persistence.Basic; import javax.persistence.DiscriminatorColumn; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ReferencedEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ReferencedEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ReferencedEntity.java index bcf75f80d0..b9fadf949a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ReferencedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/childrelation/ReferencedEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.single.childrelation; +package org.hibernate.orm.test.envers.integration.inheritance.single.childrelation; import java.util.Set; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ChildEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ChildEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ChildEntity.java index 5b422d77c4..1ff7d1c25f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ChildEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ChildEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.single.discriminatorformula; +package org.hibernate.orm.test.envers.integration.inheritance.single.discriminatorformula; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ClassTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ClassTypeEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ClassTypeEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ClassTypeEntity.java index 9ff7046c12..f9a286ca7a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ClassTypeEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ClassTypeEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.single.discriminatorformula; +package org.hibernate.orm.test.envers.integration.inheritance.single.discriminatorformula; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/DiscriminatorFormulaTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/DiscriminatorFormulaTest.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/DiscriminatorFormulaTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/DiscriminatorFormulaTest.java index 20609fdd74..f4de968bc4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/DiscriminatorFormulaTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/DiscriminatorFormulaTest.java @@ -4,15 +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.envers.test.integration.inheritance.single.discriminatorformula; +package org.hibernate.orm.test.envers.integration.inheritance.single.discriminatorformula; import java.util.Arrays; import java.util.Iterator; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.mapping.Formula; import org.hibernate.mapping.PersistentClass; @@ -38,7 +38,7 @@ public class DiscriminatorFormulaTest extends BaseEnversJPAFunctionalTestCase { @Priority(10) public void initData() { parentAudit = metadata().getEntityBinding( - "org.hibernate.envers.test.integration.inheritance.single.discriminatorformula.ParentEntity_AUD" + "org.hibernate.orm.test.envers.integration.inheritance.single.discriminatorformula.ParentEntity_AUD" ); EntityManager em = getEntityManager(); diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ParentEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ParentEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ParentEntity.java index f9a06cd864..dda09b86ab 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ParentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/discriminatorformula/ParentEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.single.discriminatorformula; +package org.hibernate.orm.test.envers.integration.inheritance.single.discriminatorformula; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/Address.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Address.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/Address.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Address.java index 766a5e1407..5dbfa7314b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/Address.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Address.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.single.notownedrelation; +package org.hibernate.orm.test.envers.integration.inheritance.single.notownedrelation; import java.io.Serializable; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/Contact.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Contact.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/Contact.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Contact.java index dd49a1094f..ddc1fa42a8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/Contact.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/Contact.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.single.notownedrelation; +package org.hibernate.orm.test.envers.integration.inheritance.single.notownedrelation; import java.io.Serializable; import java.util.Set; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/NotOwnedBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/NotOwnedBidirectional.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/NotOwnedBidirectional.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/NotOwnedBidirectional.java index c04eeaa88b..3b24959049 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/NotOwnedBidirectional.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/NotOwnedBidirectional.java @@ -5,14 +5,14 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.single.notownedrelation; +package org.hibernate.orm.test.envers.integration.inheritance.single.notownedrelation; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/PersonalContact.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/PersonalContact.java similarity index 87% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/PersonalContact.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/PersonalContact.java index 92fde0dd8d..3140718a23 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/PersonalContact.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/notownedrelation/PersonalContact.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.single.notownedrelation; +package org.hibernate.orm.test.envers.integration.inheritance.single.notownedrelation; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ChildIngEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ChildIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ChildIngEntity.java index f2bdc3b12a..f4e49bdb01 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ChildIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ChildIngEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.single.relation; +package org.hibernate.orm.test.envers.integration.inheritance.single.relation; import javax.persistence.Basic; import javax.persistence.DiscriminatorValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ParentIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ParentIngEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ParentIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ParentIngEntity.java index 6b261b8e68..c5347b488c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ParentIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ParentIngEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.single.relation; +package org.hibernate.orm.test.envers.integration.inheritance.single.relation; import javax.persistence.Basic; import javax.persistence.DiscriminatorColumn; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/PolymorphicCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicCollection.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/PolymorphicCollection.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicCollection.java index e1e14bc92d..509c295023 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/PolymorphicCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicCollection.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.envers.test.integration.inheritance.single.relation; +package org.hibernate.orm.test.envers.integration.inheritance.single.relation; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/PolymorphicRemovalTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicRemovalTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/PolymorphicRemovalTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicRemovalTest.java index bb4dcd0286..5d19c598a7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/PolymorphicRemovalTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/PolymorphicRemovalTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.single.relation; +package org.hibernate.orm.test.envers.integration.inheritance.single.relation; import java.util.Arrays; import java.util.Set; @@ -22,8 +22,8 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ReferencedEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ReferencedEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ReferencedEntity.java index 1496d2e050..a0cff87666 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ReferencedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/relation/ReferencedEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.single.relation; +package org.hibernate.orm.test.envers.integration.inheritance.single.relation; import java.util.Set; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildAuditing.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ChildAuditing.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildAuditing.java index 0d089ee295..ec18306533 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ChildAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildAuditing.java @@ -5,13 +5,13 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.tableperclass; +package org.hibernate.orm.test.envers.integration.inheritance.tableperclass; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ChildEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildEntity.java index 0c28485cb7..7386e01ad3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ChildEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ChildEntity.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.tableperclass; +package org.hibernate.orm.test.envers.integration.inheritance.tableperclass; import javax.persistence.Basic; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ParentAuditing.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentAuditing.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ParentAuditing.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentAuditing.java index 6dc2e32595..df0b0376fd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ParentAuditing.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentAuditing.java @@ -5,13 +5,13 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.tableperclass; +package org.hibernate.orm.test.envers.integration.inheritance.tableperclass; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ParentEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentEntity.java index 6b27ca2530..fa2df21d7e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ParentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/ParentEntity.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.tableperclass; +package org.hibernate.orm.test.envers.integration.inheritance.tableperclass; import javax.persistence.Basic; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/abstractparent/AbstractEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AbstractEntity.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/abstractparent/AbstractEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AbstractEntity.java index 53ef7b055d..9e931a39ca 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/abstractparent/AbstractEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AbstractEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.tableperclass.abstractparent; +package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.abstractparent; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.java similarity index 85% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.java index 03cdb3f11b..bda79571b8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.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.envers.test.integration.inheritance.tableperclass.abstractparent; +package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.abstractparent; -import java.util.Iterator; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.mapping.Table; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/abstractparent/EffectiveEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/EffectiveEntity1.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/abstractparent/EffectiveEntity1.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/EffectiveEntity1.java index 4aa89cf25b..25a8d7ee2b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/abstractparent/EffectiveEntity1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/abstractparent/EffectiveEntity1.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.tableperclass.abstractparent; +package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.abstractparent; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/Address.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Address.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/Address.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Address.java index e15515beb8..6e0f1621bb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/Address.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Address.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.tableperclass.notownedrelation; +package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.notownedrelation; import java.io.Serializable; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/Contact.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Contact.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/Contact.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Contact.java index 5be4ba6d91..ae10fe0d7a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/Contact.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/Contact.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.tableperclass.notownedrelation; +package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.notownedrelation; import java.io.Serializable; import java.util.Set; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/NotOwnedBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/NotOwnedBidirectional.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/NotOwnedBidirectional.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/NotOwnedBidirectional.java index 4ea697fdf2..e86357fba3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/NotOwnedBidirectional.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/NotOwnedBidirectional.java @@ -5,14 +5,14 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.tableperclass.notownedrelation; +package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.notownedrelation; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/PersonalContact.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/PersonalContact.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/PersonalContact.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/PersonalContact.java index 82d98fbf40..e9191933b0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/PersonalContact.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/notownedrelation/PersonalContact.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.tableperclass.notownedrelation; +package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.notownedrelation; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ChildIngEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ChildIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ChildIngEntity.java index ad9793ca27..e9d6cd39a8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ChildIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ChildIngEntity.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.tableperclass.relation; +package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.relation; import javax.persistence.Basic; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ParentIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ParentIngEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ParentIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ParentIngEntity.java index ebd53d0eb8..b8cab2c3fe 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ParentIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ParentIngEntity.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.tableperclass.relation; +package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.relation; import javax.persistence.Basic; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/PolymorphicCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/PolymorphicCollection.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/PolymorphicCollection.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/PolymorphicCollection.java index fff843a498..7e74cb46cd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/PolymorphicCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/PolymorphicCollection.java @@ -5,14 +5,14 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.tableperclass.relation; +package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.relation; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ReferencedEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ReferencedEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ReferencedEntity.java index 2d30798416..9883970ca9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ReferencedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/tableperclass/relation/ReferencedEntity.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.inheritance.tableperclass.relation; +package org.hibernate.orm.test.envers.integration.inheritance.tableperclass.relation; import java.util.Set; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/Component1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/Component1.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/Component1.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/Component1.java index b1b19327b2..b766146421 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/Component1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/Component1.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.components; +package org.hibernate.orm.test.envers.integration.interfaces.components; import javax.persistence.Embeddable; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/ComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/ComponentTestEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/ComponentTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/ComponentTestEntity.java index 45a42da273..d551b3f41a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/ComponentTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/ComponentTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.components; +package org.hibernate.orm.test.envers.integration.interfaces.components; import javax.persistence.Embedded; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/IComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/IComponent.java similarity index 83% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/IComponent.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/IComponent.java index 844efb7f97..727d031c76 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/IComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/IComponent.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.components; +package org.hibernate.orm.test.envers.integration.interfaces.components; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/InterfacesComponents.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/InterfacesComponents.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/InterfacesComponents.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/InterfacesComponents.java index ae662bfdf3..f0874da111 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/InterfacesComponents.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/components/InterfacesComponents.java @@ -4,13 +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.envers.test.integration.interfaces.components; +package org.hibernate.orm.test.envers.integration.interfaces.components; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/AbstractAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/AbstractAllAuditedTest.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/AbstractAllAuditedTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/AbstractAllAuditedTest.java index 1c6403ae80..6b9baad76d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/AbstractAllAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/AbstractAllAuditedTest.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.envers.test.integration.interfaces.hbm.allAudited; +package org.hibernate.orm.test.envers.integration.interfaces.hbm.allAudited; import java.util.Arrays; import javax.persistence.EntityManager; import org.hibernate.envers.exception.NotAuditedException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/AuditedImplementor.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/AuditedImplementor.java similarity index 84% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/AuditedImplementor.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/AuditedImplementor.java index e0035c3d69..cc920455e7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/AuditedImplementor.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/AuditedImplementor.java @@ -4,9 +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.envers.test.integration.interfaces.hbm.allAudited; +package org.hibernate.orm.test.envers.integration.interfaces.hbm.allAudited; import org.hibernate.envers.Audited; +import org.hibernate.orm.test.envers.integration.interfaces.hbm.allAudited.SimpleInterface; /** * @author Hern�n Chanfreau diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/NonAuditedImplementor.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/NonAuditedImplementor.java similarity index 83% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/NonAuditedImplementor.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/NonAuditedImplementor.java index 94798b402c..1b72360342 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/NonAuditedImplementor.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/NonAuditedImplementor.java @@ -4,9 +4,11 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.hbm.allAudited; +package org.hibernate.orm.test.envers.integration.interfaces.hbm.allAudited; +import org.hibernate.orm.test.envers.integration.interfaces.hbm.allAudited.SimpleInterface; + /** * @author Hern�n Chanfreau */ diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/SimpleInterface.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/SimpleInterface.java similarity index 85% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/SimpleInterface.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/SimpleInterface.java index dc00a5932a..e97e4bc571 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/SimpleInterface.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/SimpleInterface.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.hbm.allAudited; +package org.hibernate.orm.test.envers.integration.interfaces.hbm.allAudited; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/subclass/SubclassAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/subclass/SubclassAllAuditedTest.java similarity index 72% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/subclass/SubclassAllAuditedTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/subclass/SubclassAllAuditedTest.java index a317661046..088379b434 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/subclass/SubclassAllAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/subclass/SubclassAllAuditedTest.java @@ -4,9 +4,9 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.hbm.allAudited.subclass; +package org.hibernate.orm.test.envers.integration.interfaces.hbm.allAudited.subclass; -import org.hibernate.envers.test.integration.interfaces.hbm.allAudited.AbstractAllAuditedTest; +import org.hibernate.orm.test.envers.integration.interfaces.hbm.allAudited.AbstractAllAuditedTest; /** * @author Hern�n Chanfreau diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/union/UnionAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/union/UnionAllAuditedTest.java similarity index 72% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/union/UnionAllAuditedTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/union/UnionAllAuditedTest.java index 5a6953d395..95a7f33e23 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/union/UnionAllAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/allAudited/union/UnionAllAuditedTest.java @@ -4,9 +4,9 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.hbm.allAudited.union; +package org.hibernate.orm.test.envers.integration.interfaces.hbm.allAudited.union; -import org.hibernate.envers.test.integration.interfaces.hbm.allAudited.AbstractAllAuditedTest; +import org.hibernate.orm.test.envers.integration.interfaces.hbm.allAudited.AbstractAllAuditedTest; /** * @author Hern�n Chanfreau diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java index 3f305e06fc..cb184ca322 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java @@ -4,13 +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.envers.test.integration.interfaces.hbm.propertiesAudited; +package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited; import javax.persistence.EntityManager; import org.hibernate.envers.exception.NotAuditedException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/AuditedImplementor.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/AuditedImplementor.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/AuditedImplementor.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/AuditedImplementor.java index 1d19151131..5630b7df9a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/AuditedImplementor.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/AuditedImplementor.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited; +package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/NonAuditedImplementor.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/NonAuditedImplementor.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/NonAuditedImplementor.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/NonAuditedImplementor.java index c6ec73c19e..9084db8e56 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/NonAuditedImplementor.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/NonAuditedImplementor.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited; +package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/SimpleInterface.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/SimpleInterface.java similarity index 85% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/SimpleInterface.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/SimpleInterface.java index 1f57a8118a..8bdbc2ce41 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/SimpleInterface.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/SimpleInterface.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited; +package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/joined/JoinedPropertiesAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/joined/JoinedPropertiesAuditedTest.java similarity index 70% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/joined/JoinedPropertiesAuditedTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/joined/JoinedPropertiesAuditedTest.java index c3a446c525..f8c339c6a6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/joined/JoinedPropertiesAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/joined/JoinedPropertiesAuditedTest.java @@ -4,9 +4,9 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited.joined; +package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited.joined; -import org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited.AbstractPropertiesAuditedTest; +import org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited.AbstractPropertiesAuditedTest; /** * @author Hern�n Chanfreau diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/subclass/SubclassPropertiesAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/subclass/SubclassPropertiesAuditedTest.java similarity index 70% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/subclass/SubclassPropertiesAuditedTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/subclass/SubclassPropertiesAuditedTest.java index 325dc4af33..afd2c5bfc5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/subclass/SubclassPropertiesAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/subclass/SubclassPropertiesAuditedTest.java @@ -4,9 +4,9 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited.subclass; +package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited.subclass; -import org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited.AbstractPropertiesAuditedTest; +import org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited.AbstractPropertiesAuditedTest; /** * @author Hern�n Chanfreau diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/union/UnionPropertiesAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/union/UnionPropertiesAuditedTest.java similarity index 70% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/union/UnionPropertiesAuditedTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/union/UnionPropertiesAuditedTest.java index a130a91b8d..d5653968d7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/union/UnionPropertiesAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited/union/UnionPropertiesAuditedTest.java @@ -4,9 +4,9 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited.union; +package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited.union; -import org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited.AbstractPropertiesAuditedTest; +import org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited.AbstractPropertiesAuditedTest; /** * @author Hern�n Chanfreau diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/AbstractPropertiesAudited2Test.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/AbstractPropertiesAudited2Test.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/AbstractPropertiesAudited2Test.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/AbstractPropertiesAudited2Test.java index 3c2f58f95c..558883f928 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/AbstractPropertiesAudited2Test.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/AbstractPropertiesAudited2Test.java @@ -4,13 +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.envers.test.integration.interfaces.hbm.propertiesAudited2; +package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited2; import javax.persistence.EntityManager; import org.hibernate.envers.exception.NotAuditedException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/AuditedImplementor.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/AuditedImplementor.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/AuditedImplementor.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/AuditedImplementor.java index 096ab91568..747b6f4eac 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/AuditedImplementor.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/AuditedImplementor.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2; +package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited2; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/NonAuditedImplementor.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/NonAuditedImplementor.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/NonAuditedImplementor.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/NonAuditedImplementor.java index 8996ec0ed6..c41d6ab054 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/NonAuditedImplementor.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/NonAuditedImplementor.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2; +package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited2; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/SimpleInterface.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/SimpleInterface.java similarity index 85% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/SimpleInterface.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/SimpleInterface.java index 57142ebed9..61c0ff2a7b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/SimpleInterface.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/SimpleInterface.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2; +package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited2; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/joined/JoinedPropertiesAudited2Test.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/joined/JoinedPropertiesAudited2Test.java similarity index 70% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/joined/JoinedPropertiesAudited2Test.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/joined/JoinedPropertiesAudited2Test.java index 43c0473944..bdb5c756af 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/joined/JoinedPropertiesAudited2Test.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/joined/JoinedPropertiesAudited2Test.java @@ -4,9 +4,9 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.joined; +package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited2.joined; -import org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.AbstractPropertiesAudited2Test; +import org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited2.AbstractPropertiesAudited2Test; /** * @author Hern�n Chanfreau diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/subclass/SubclassPropertiesAudited2Test.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/subclass/SubclassPropertiesAudited2Test.java similarity index 70% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/subclass/SubclassPropertiesAudited2Test.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/subclass/SubclassPropertiesAudited2Test.java index aa600dcd3f..420b3e6dbd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/subclass/SubclassPropertiesAudited2Test.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/subclass/SubclassPropertiesAudited2Test.java @@ -4,9 +4,9 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.subclass; +package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited2.subclass; -import org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.AbstractPropertiesAudited2Test; +import org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited2.AbstractPropertiesAudited2Test; /** * @author Hern�n Chanfreau diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/union/UnionPropertiesAudited2Test.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/union/UnionPropertiesAudited2Test.java similarity index 70% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/union/UnionPropertiesAudited2Test.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/union/UnionPropertiesAudited2Test.java index bccd68687c..5bdcc403ab 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/union/UnionPropertiesAudited2Test.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/hbm/propertiesAudited2/union/UnionPropertiesAudited2Test.java @@ -4,9 +4,9 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.union; +package org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited2.union; -import org.hibernate.envers.test.integration.interfaces.hbm.propertiesAudited2.AbstractPropertiesAudited2Test; +import org.hibernate.orm.test.envers.integration.interfaces.hbm.propertiesAudited2.AbstractPropertiesAudited2Test; /** * @author Hern�n Chanfreau diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/ISetRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/ISetRefEdEntity.java similarity index 85% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/ISetRefEdEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/ISetRefEdEntity.java index fb5c91ea63..2af35d60d2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/ISetRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/ISetRefEdEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.relation; +package org.hibernate.orm.test.envers.integration.interfaces.relation; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/InterfacesRelation.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/InterfacesRelation.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/InterfacesRelation.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/InterfacesRelation.java index 96148540fb..3649d88f9b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/InterfacesRelation.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/InterfacesRelation.java @@ -4,13 +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.envers.test.integration.interfaces.relation; +package org.hibernate.orm.test.envers.integration.interfaces.relation; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/SetRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefEdEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/SetRefEdEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefEdEntity.java index 097aa02ac9..4c5de681dc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/SetRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefEdEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.relation; +package org.hibernate.orm.test.envers.integration.interfaces.relation; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/SetRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefIngEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/SetRefIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefIngEntity.java index 2444db4b04..358076410e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/SetRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/interfaces/relation/SetRefIngEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.interfaces.relation; +package org.hibernate.orm.test.envers.integration.interfaces.relation; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/DeleteCollectionJtaSessionClosedBeforeCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/DeleteCollectionJtaSessionClosedBeforeCommitTest.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/DeleteCollectionJtaSessionClosedBeforeCommitTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/DeleteCollectionJtaSessionClosedBeforeCommitTest.java index 66c0062b38..46babb328e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/DeleteCollectionJtaSessionClosedBeforeCommitTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/DeleteCollectionJtaSessionClosedBeforeCommitTest.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.envers.test.integration.jta; +package org.hibernate.orm.test.envers.integration.jta; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.EntityManager; import javax.persistence.Id; @@ -21,8 +20,8 @@ import javax.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.jta.TestingJtaBootstrap; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/IdentifierProxyJtaSessionClosedBeforeCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/IdentifierProxyJtaSessionClosedBeforeCommitTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/IdentifierProxyJtaSessionClosedBeforeCommitTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/IdentifierProxyJtaSessionClosedBeforeCommitTest.java index 798c0a575a..83ef12fe40 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/IdentifierProxyJtaSessionClosedBeforeCommitTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/IdentifierProxyJtaSessionClosedBeforeCommitTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.jta; +package org.hibernate.orm.test.envers.integration.jta; import java.util.ArrayList; import java.util.Arrays; @@ -25,8 +25,8 @@ import javax.persistence.OneToMany; import org.hibernate.cfg.AvailableSettings; import org.hibernate.envers.AuditJoinTable; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.DialectChecks; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaExceptionListener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaExceptionListener.java similarity index 80% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaExceptionListener.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaExceptionListener.java index c1581622b6..165fa43cc2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaExceptionListener.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaExceptionListener.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.jta; +package org.hibernate.orm.test.envers.integration.jta; import java.util.Map; import javax.persistence.EntityManager; import javax.transaction.RollbackException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.integration.reventity.ExceptionListenerRevEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.integration.reventity.ExceptionListenerRevEntity; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.jta.TestingJtaPlatformImpl; @@ -21,7 +21,7 @@ import org.junit.Assert; import org.junit.Test; /** - * Same as {@link org.hibernate.envers.test.integration.reventity.ExceptionListener}, but in a JTA environment. + * Same as {@link org.hibernate.orm.test.envers.integration.reventity.ExceptionListener}, but in a JTA environment. * * @author Adam Warski (adam at warski dot org) */ diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaSessionClosedBeforeCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaSessionClosedBeforeCommitTest.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaSessionClosedBeforeCommitTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaSessionClosedBeforeCommitTest.java index 768ae71bc7..2b3517505f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaSessionClosedBeforeCommitTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaSessionClosedBeforeCommitTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.jta; +package org.hibernate.orm.test.envers.integration.jta; import java.util.Arrays; import java.util.Map; @@ -12,9 +12,9 @@ import java.util.Map; import javax.persistence.EntityManager; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.IntTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.IntTestEntity; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.jta.TestingJtaPlatformImpl; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaTransaction.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransaction.java similarity index 86% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaTransaction.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransaction.java index e17f81ef8a..f92c3d183e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaTransaction.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransaction.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.jta; +package org.hibernate.orm.test.envers.integration.jta; import java.util.List; import java.util.Map; import javax.persistence.EntityManager; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.IntTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.IntTestEntity; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.jta.TestingJtaPlatformImpl; @@ -21,7 +21,7 @@ import org.junit.Assert; import org.junit.Test; /** - * Same as {@link org.hibernate.envers.test.integration.basic.Simple}, but in a JTA environment. + * Same as {@link org.hibernate.orm.test.envers.integration.basic.Simple}, but in a JTA environment. * * @author Adam Warski (adam at warski dot org) */ diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaTransactionAfterCallbackTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransactionAfterCallbackTest.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaTransactionAfterCallbackTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransactionAfterCallbackTest.java index 4380fe4d05..32011970e6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaTransactionAfterCallbackTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/JtaTransactionAfterCallbackTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.jta; +package org.hibernate.orm.test.envers.integration.jta; import java.lang.reflect.Field; import java.util.Map; @@ -22,9 +22,9 @@ import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.envers.boot.internal.EnversService; import org.hibernate.envers.internal.synchronization.AuditProcess; import org.hibernate.envers.internal.synchronization.AuditProcessManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.IntTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.IntTestEntity; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/OneToManyJtaSessionClosedBeforeCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/OneToManyJtaSessionClosedBeforeCommitTest.java similarity index 87% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/OneToManyJtaSessionClosedBeforeCommitTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/OneToManyJtaSessionClosedBeforeCommitTest.java index 941a2e8f05..c627610d10 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/OneToManyJtaSessionClosedBeforeCommitTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/jta/OneToManyJtaSessionClosedBeforeCommitTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.jta; +package org.hibernate.orm.test.envers.integration.jta; import java.util.Arrays; import java.util.HashSet; @@ -13,10 +13,10 @@ import java.util.Set; import javax.persistence.EntityManager; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.onetomany.SetRefEdEntity; -import org.hibernate.envers.test.entities.onetomany.SetRefIngEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.onetomany.SetRefEdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.SetRefIngEntity; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.jta.TestingJtaBootstrap; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicList.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicList.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicList.java index 9cb65aee3e..a4f7f4c10f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicList.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicList.java @@ -4,18 +4,18 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytomany; +package org.hibernate.orm.test.envers.integration.manytomany; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.manytomany.ListOwnedEntity; -import org.hibernate.envers.test.entities.manytomany.ListOwningEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.manytomany.ListOwnedEntity; +import org.hibernate.orm.test.envers.entities.manytomany.ListOwningEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicMap.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicMap.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicMap.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicMap.java index 43baf8d28a..39ddf62d5d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicMap.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicMap.java @@ -4,18 +4,18 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytomany; +package org.hibernate.orm.test.envers.integration.manytomany; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.manytomany.MapOwnedEntity; -import org.hibernate.envers.test.entities.manytomany.MapOwningEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.manytomany.MapOwnedEntity; +import org.hibernate.orm.test.envers.entities.manytomany.MapOwningEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicSet.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicSet.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicSet.java index c1d09f8233..4e2ae0c788 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicSet.java @@ -4,18 +4,18 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytomany; +package org.hibernate.orm.test.envers.integration.manytomany; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.manytomany.SetOwnedEntity; -import org.hibernate.envers.test.entities.manytomany.SetOwningEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.manytomany.SetOwnedEntity; +import org.hibernate.orm.test.envers.entities.manytomany.SetOwningEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/CustomComparatorEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/CustomComparatorEntityTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/CustomComparatorEntityTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/CustomComparatorEntityTest.java index b062f39b77..c98bca8783 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/CustomComparatorEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/CustomComparatorEntityTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytomany; +package org.hibernate.orm.test.envers.integration.manytomany; import java.util.Arrays; import java.util.Iterator; @@ -13,11 +13,11 @@ import java.util.SortedMap; import java.util.SortedSet; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.StrTestEntityComparator; -import org.hibernate.envers.test.entities.manytomany.SortedSetEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntityComparator; +import org.hibernate.orm.test.envers.entities.manytomany.SortedSetEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/IndexColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/IndexColumnListTest.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/IndexColumnListTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/IndexColumnListTest.java index 2357ac60dc..ef4a0e5d48 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/IndexColumnListTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/IndexColumnListTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytomany; +package org.hibernate.orm.test.envers.integration.manytomany; import java.util.ArrayList; import java.util.Arrays; @@ -15,8 +15,8 @@ import javax.persistence.ManyToMany; import javax.persistence.OrderColumn; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.transaction.TransactionUtil; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/MappedByEmbeddableAttributeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/MappedByEmbeddableAttributeTest.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/MappedByEmbeddableAttributeTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/MappedByEmbeddableAttributeTest.java index 0344b042ed..763cca2e0f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/MappedByEmbeddableAttributeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/MappedByEmbeddableAttributeTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytomany; +package org.hibernate.orm.test.envers.integration.manytomany; import java.util.ArrayList; import java.util.Arrays; @@ -21,8 +21,8 @@ import javax.persistence.ManyToMany; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/OrderColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/OrderColumnListTest.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/OrderColumnListTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/OrderColumnListTest.java index 5c8d22d3c9..cd4d237624 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/OrderColumnListTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/OrderColumnListTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytomany; +package org.hibernate.orm.test.envers.integration.manytomany; import java.util.ArrayList; import java.util.Arrays; @@ -16,8 +16,8 @@ import javax.persistence.ManyToMany; import javax.persistence.OrderColumn; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/biowned/BasicBiowned.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/biowned/BasicBiowned.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/biowned/BasicBiowned.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/biowned/BasicBiowned.java index 4c406ce854..cdc484d928 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/biowned/BasicBiowned.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/biowned/BasicBiowned.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytomany.biowned; +package org.hibernate.orm.test.envers.integration.manytomany.biowned; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.manytomany.biowned.ListBiowning1Entity; -import org.hibernate.envers.test.entities.manytomany.biowned.ListBiowning2Entity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.manytomany.biowned.ListBiowning1Entity; +import org.hibernate.orm.test.envers.entities.manytomany.biowned.ListBiowning2Entity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSubclass.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSubclass.java similarity index 86% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSubclass.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSubclass.java index 729fb9ead8..fbb3dbaf56 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSubclass.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSubclass.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany.inverseToSuperclass; +package org.hibernate.orm.test.envers.integration.manytomany.inverseToSuperclass; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSubclass2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSubclass2.java similarity index 86% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSubclass2.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSubclass2.java index 25f15aa441..eca2bbfadf 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSubclass2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSubclass2.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany.inverseToSuperclass; +package org.hibernate.orm.test.envers.integration.manytomany.inverseToSuperclass; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSuperclass.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSuperclass.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSuperclass.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSuperclass.java index 3a131d2219..9281d37547 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSuperclass.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/DetailSuperclass.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytomany.inverseToSuperclass; +package org.hibernate.orm.test.envers.integration.manytomany.inverseToSuperclass; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java index 064a39d65b..f318d3037e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java @@ -4,13 +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.envers.test.integration.manytomany.inverseToSuperclass; +package org.hibernate.orm.test.envers.integration.manytomany.inverseToSuperclass; import java.util.ArrayList; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/Root.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/Root.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/Root.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/Root.java index b99f27532b..6719cdd247 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/Root.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/inverseToSuperclass/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.envers.test.integration.onetomany.inverseToSuperclass; +package org.hibernate.orm.test.envers.integration.manytomany.inverseToSuperclass; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/sametable/BasicSametable.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/sametable/BasicSametable.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/sametable/BasicSametable.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/sametable/BasicSametable.java index df2b2e4e55..67233a7752 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/sametable/BasicSametable.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/sametable/BasicSametable.java @@ -4,19 +4,19 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytomany.sametable; +package org.hibernate.orm.test.envers.integration.manytomany.sametable; import java.sql.Types; import java.util.Arrays; import javax.persistence.EntityManager; import org.hibernate.Session; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.manytomany.sametable.Child1Entity; -import org.hibernate.envers.test.entities.manytomany.sametable.Child2Entity; -import org.hibernate.envers.test.entities.manytomany.sametable.ParentEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.manytomany.sametable.Child1Entity; +import org.hibernate.orm.test.envers.entities.manytomany.sametable.Child2Entity; +import org.hibernate.orm.test.envers.entities.manytomany.sametable.ParentEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMap.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMap.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMap.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMap.java index 9b1072a3ae..69952bb156 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMap.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMap.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytomany.ternary; +package org.hibernate.orm.test.envers.integration.manytomany.ternary; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.IntTestPrivSeqEntity; -import org.hibernate.envers.test.entities.StrTestPrivSeqEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.IntTestPrivSeqEntity; +import org.hibernate.orm.test.envers.entities.StrTestPrivSeqEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMapEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapEntity.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMapEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapEntity.java index da7566e16c..c7bbefa4e2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMapEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytomany.ternary; +package org.hibernate.orm.test.envers.integration.manytomany.ternary; import java.util.HashMap; import java.util.Map; @@ -14,8 +14,8 @@ import javax.persistence.Id; import javax.persistence.ManyToMany; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.IntTestPrivSeqEntity; -import org.hibernate.envers.test.entities.StrTestPrivSeqEntity; +import org.hibernate.orm.test.envers.entities.IntTestPrivSeqEntity; +import org.hibernate.orm.test.envers.entities.StrTestPrivSeqEntity; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMapFlush.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapFlush.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMapFlush.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapFlush.java index 33a07b4944..8576d9c680 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMapFlush.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/ternary/TernaryMapFlush.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.envers.test.integration.manytomany.ternary; +package org.hibernate.orm.test.envers.integration.manytomany.ternary; import java.util.Arrays; import java.util.HashMap; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.IntTestPrivSeqEntity; -import org.hibernate.envers.test.entities.StrTestPrivSeqEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.IntTestPrivSeqEntity; +import org.hibernate.orm.test.envers.entities.StrTestPrivSeqEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniList.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniList.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniList.java index 76de9232e4..7c21025b3a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniList.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniList.java @@ -4,18 +4,18 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytomany.unidirectional; +package org.hibernate.orm.test.envers.integration.manytomany.unidirectional; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.manytomany.unidirectional.ListUniEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.manytomany.unidirectional.ListUniEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniMap.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniMap.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniMap.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniMap.java index 8ae3cc4599..85beec4e32 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniMap.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniMap.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.envers.test.integration.manytomany.unidirectional; +package org.hibernate.orm.test.envers.integration.manytomany.unidirectional; import java.util.Arrays; import java.util.HashMap; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.manytomany.unidirectional.MapUniEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.manytomany.unidirectional.MapUniEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniSet.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniSet.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniSet.java index f36d455884..a1d9e74640 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/BasicUniSet.java @@ -4,18 +4,18 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytomany.unidirectional; +package org.hibernate.orm.test.envers.integration.manytomany.unidirectional; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.manytomany.unidirectional.SetUniEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.manytomany.unidirectional.SetUniEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/JoinTableDetachedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/JoinTableDetachedTest.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/JoinTableDetachedTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/JoinTableDetachedTest.java index a023e33ea5..e31a455c31 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/JoinTableDetachedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/JoinTableDetachedTest.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytomany.unidirectional; +package org.hibernate.orm.test.envers.integration.manytomany.unidirectional; import java.util.Arrays; import java.util.HashSet; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.manytomany.unidirectional.JoinTableEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.manytomany.unidirectional.JoinTableEntity; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/M2MIndexedListNotAuditedTarget.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MIndexedListNotAuditedTarget.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/M2MIndexedListNotAuditedTarget.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MIndexedListNotAuditedTarget.java index 317086f858..5026fb58e7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/M2MIndexedListNotAuditedTarget.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MIndexedListNotAuditedTarget.java @@ -4,20 +4,20 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytomany.unidirectional; +package org.hibernate.orm.test.envers.integration.manytomany.unidirectional; import java.util.Arrays; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.UnversionedStrTestEntity; -import org.hibernate.envers.test.entities.manytomany.unidirectional.M2MIndexedListTargetNotAuditedEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity; +import org.hibernate.orm.test.envers.entities.manytomany.unidirectional.M2MIndexedListTargetNotAuditedEntity; import org.junit.Test; -import static org.hibernate.envers.test.tools.TestTools.checkCollection; +import static org.hibernate.orm.test.envers.tools.TestTools.checkCollection; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/M2MRelationNotAuditedTarget.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MRelationNotAuditedTarget.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/M2MRelationNotAuditedTarget.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MRelationNotAuditedTarget.java index 5321048cdd..8592782bac 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/M2MRelationNotAuditedTarget.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/unidirectional/M2MRelationNotAuditedTarget.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.envers.test.integration.manytomany.unidirectional; +package org.hibernate.orm.test.envers.integration.manytomany.unidirectional; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.UnversionedStrTestEntity; -import org.hibernate.envers.test.entities.manytomany.unidirectional.M2MTargetNotAuditedEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity; +import org.hibernate.orm.test.envers.entities.manytomany.unidirectional.M2MTargetNotAuditedEntity; import org.junit.Test; -import static org.hibernate.envers.test.tools.TestTools.checkCollection; +import static org.hibernate.orm.test.envers.tools.TestTools.checkCollection; import static org.junit.Assert.assertTrue; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/DetachedUpdateTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/DetachedUpdateTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/DetachedUpdateTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/DetachedUpdateTest.java index 0580edf073..8183d7bbb3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/DetachedUpdateTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/DetachedUpdateTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytoone; +package org.hibernate.orm.test.envers.integration.manytoone; import java.util.Arrays; import java.util.Collections; @@ -17,8 +17,8 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/EmbeddedIdManyToOneForeignKeyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/EmbeddedIdManyToOneForeignKeyTest.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/EmbeddedIdManyToOneForeignKeyTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/EmbeddedIdManyToOneForeignKeyTest.java index fa9f0e5b7a..87c4e3031f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/EmbeddedIdManyToOneForeignKeyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/EmbeddedIdManyToOneForeignKeyTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytoone; +package org.hibernate.orm.test.envers.integration.manytoone; import java.io.Serializable; import java.util.ArrayList; @@ -13,7 +13,6 @@ import java.util.List; import javax.persistence.Embeddable; import javax.persistence.EmbeddedId; import javax.persistence.Entity; -import javax.persistence.EntityManager; import javax.persistence.ForeignKey; import javax.persistence.Id; import javax.persistence.JoinColumn; @@ -24,7 +23,7 @@ import javax.persistence.OneToMany; import org.hibernate.envers.AuditJoinTable; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.hibernate.mapping.Table; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/unidirectional/RelationNotAuditedTarget.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/unidirectional/RelationNotAuditedTarget.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/unidirectional/RelationNotAuditedTarget.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/unidirectional/RelationNotAuditedTarget.java index 3ea8df7b7b..72e3bbbcd9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/unidirectional/RelationNotAuditedTarget.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/unidirectional/RelationNotAuditedTarget.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.envers.test.integration.manytoone.unidirectional; +package org.hibernate.orm.test.envers.integration.manytoone.unidirectional; import java.util.Arrays; import java.util.List; import javax.persistence.EntityManager; import org.hibernate.Hibernate; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.UnversionedStrTestEntity; -import org.hibernate.envers.test.entities.manytoone.unidirectional.TargetNotAuditedEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity; +import org.hibernate.orm.test.envers.entities.manytoone.unidirectional.TargetNotAuditedEntity; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.HibernateProxyHelper; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/merge/AddDelTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/AddDelTest.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/merge/AddDelTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/AddDelTest.java index 3d2f695151..7c401b2f21 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/merge/AddDelTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/AddDelTest.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.envers.test.integration.merge; +package org.hibernate.orm.test.envers.integration.merge; import java.util.Arrays; import org.hibernate.Session; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/merge/GivenIdStrEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/GivenIdStrEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/merge/GivenIdStrEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/GivenIdStrEntity.java index e9c8afaa19..3c17e4eee2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/merge/GivenIdStrEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/GivenIdStrEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.merge; +package org.hibernate.orm.test.envers.integration.merge; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java index a756348ce3..4d819aad14 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; import java.util.Map; @@ -12,7 +12,7 @@ import java.util.Map; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.AuditQuery; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; /** * Base test for modified flags feature diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsOneSessionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/AbstractModifiedFlagsOneSessionTest.java similarity index 86% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsOneSessionTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/AbstractModifiedFlagsOneSessionTest.java index ddcd075ce5..ccc779d6f1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsOneSessionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/AbstractModifiedFlagsOneSessionTest.java @@ -4,11 +4,11 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import org.hibernate.cfg.Configuration; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.test.AbstractOneSessionTest; +import org.hibernate.orm.test.envers.AbstractOneSessionTest; /** * Base test for modified flags feature diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/DetachedEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/DetachedEntityTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/DetachedEntityTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/DetachedEntityTest.java index 3bd1591b5f..cad91dddd3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/DetachedEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/DetachedEntityTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.Arrays; import java.util.List; @@ -15,8 +15,8 @@ import javax.persistence.Id; import org.hibernate.Session; import org.hibernate.envers.Audited; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAuditedManyToManyRemovalTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyRemovalTest.java similarity index 84% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAuditedManyToManyRemovalTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyRemovalTest.java index 0f5c67d3e5..063742e498 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAuditedManyToManyRemovalTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyRemovalTest.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.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.Map; import javax.persistence.EntityManager; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.integration.modifiedflags.entities.Professor; -import org.hibernate.envers.test.integration.modifiedflags.entities.Student; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.modifiedflags.entities.Professor; +import org.hibernate.orm.test.envers.integration.modifiedflags.entities.Student; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAuditedManyToManyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyTest.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAuditedManyToManyTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyTest.java index 8229e1f519..c839c392d7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAuditedManyToManyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedAuditedManyToManyTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.io.File; import java.net.URISyntaxException; @@ -14,15 +14,15 @@ import java.util.List; import org.hibernate.MappingException; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.integration.entityNames.manyToManyAudited.Car; -import org.hibernate.envers.test.integration.entityNames.manyToManyAudited.Person; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.entityNames.manyToManyAudited.Car; +import org.hibernate.orm.test.envers.integration.entityNames.manyToManyAudited.Person; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; /** * @author Hernán Chanfreau diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedBidirectionalTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectionalTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedBidirectionalTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectionalTest.java index b84417b8ab..1cf54b222d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedBidirectionalTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedBidirectionalTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.ArrayList; import java.util.Arrays; @@ -17,12 +17,12 @@ import javax.persistence.OneToMany; import javax.persistence.Table; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; import static org.junit.Assert.assertEquals; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponentCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentCollection.java similarity index 87% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponentCollection.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentCollection.java index 8a6f087621..9311cb0a23 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponentCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentCollection.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.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.collection.EmbeddableListEntity1; -import org.hibernate.envers.test.entities.components.Component3; -import org.hibernate.envers.test.entities.components.Component4; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.collection.EmbeddableListEntity1; +import org.hibernate.orm.test.envers.entities.components.Component3; +import org.hibernate.orm.test.envers.entities.components.Component4; import org.hibernate.testing.TestForIssue; import org.junit.Test; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; import static org.junit.Assert.assertEquals; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponentMapKey.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentMapKey.java similarity index 86% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponentMapKey.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentMapKey.java index 882aa8701d..1e713bbacd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponentMapKey.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentMapKey.java @@ -4,22 +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.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.components.Component1; -import org.hibernate.envers.test.entities.components.Component2; -import org.hibernate.envers.test.entities.components.ComponentTestEntity; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.components.Component1; +import org.hibernate.orm.test.envers.entities.components.Component2; +import org.hibernate.orm.test.envers.entities.components.ComponentTestEntity; import org.hibernate.envers.test.integration.collection.mapkey.ComponentMapKeyEntity; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponents.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponents.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponents.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponents.java index 023ef79dc0..10f08d613a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponents.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponents.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.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.components.Component1; -import org.hibernate.envers.test.entities.components.Component2; -import org.hibernate.envers.test.entities.components.ComponentTestEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.components.Component1; +import org.hibernate.orm.test.envers.entities.components.Component2; +import org.hibernate.orm.test.envers.entities.components.ComponentTestEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; /** * @author Adam Warski (adam at warski dot org) @@ -121,7 +121,7 @@ public class HasChangedComponents extends AbstractModifiedFlagsEntityTest { TestTools.makeSet( "comp1_MOD" ), TestTools.extractModProperties( metadata().getEntityBinding( - "org.hibernate.envers.test.entities.components.ComponentTestEntity_AUD" + "org.hibernate.orm.test.envers.entities.components.ComponentTestEntity_AUD" ) ) ); diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedDetachedMultipleCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDetachedMultipleCollection.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedDetachedMultipleCollection.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDetachedMultipleCollection.java index 67c479043b..ec49959001 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedDetachedMultipleCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDetachedMultipleCollection.java @@ -4,31 +4,31 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.ArrayList; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.dialect.Oracle8iDialect; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.collection.MultipleCollectionEntity; -import org.hibernate.envers.test.entities.collection.MultipleCollectionRefEntity1; -import org.hibernate.envers.test.entities.collection.MultipleCollectionRefEntity2; +import org.hibernate.dialect.OracleDialect; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.collection.MultipleCollectionEntity; +import org.hibernate.orm.test.envers.entities.collection.MultipleCollectionRefEntity1; +import org.hibernate.orm.test.envers.entities.collection.MultipleCollectionRefEntity2; import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.TestForIssue; import org.junit.Test; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; import static org.junit.Assert.assertEquals; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ @TestForIssue(jiraKey = "HHH-7437") -@SkipForDialect(value = Oracle8iDialect.class, +@SkipForDialect(value = OracleDialect.class, comment = "Oracle does not support identity key generation") public class HasChangedDetachedMultipleCollection extends AbstractModifiedFlagsEntityTest { private Long mce1Id = null; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java index defd1c9840..b7d6ec8936 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.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.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.onetomany.detached.DoubleListJoinColumnBidirectionalRefEdEntity1; -import org.hibernate.envers.test.entities.onetomany.detached.DoubleListJoinColumnBidirectionalRefEdEntity2; -import org.hibernate.envers.test.entities.onetomany.detached.DoubleListJoinColumnBidirectionalRefIngEntity; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.onetomany.detached.DoubleListJoinColumnBidirectionalRefEdEntity1; +import org.hibernate.orm.test.envers.entities.onetomany.detached.DoubleListJoinColumnBidirectionalRefEdEntity2; +import org.hibernate.orm.test.envers.entities.onetomany.detached.DoubleListJoinColumnBidirectionalRefIngEntity; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; /** * Test for a double "fake" bidirectional mapping where one side uses @OneToMany+@JoinColumn diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedIdMapKey.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedIdMapKey.java similarity index 85% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedIdMapKey.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedIdMapKey.java index b709b72122..fb6801afb5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedIdMapKey.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedIdMapKey.java @@ -4,20 +4,20 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.envers.test.integration.collection.mapkey.IdMapKeyEntity; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedInsertUpdateSameTransactionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedInsertUpdateSameTransactionTest.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedInsertUpdateSameTransactionTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedInsertUpdateSameTransactionTest.java index 7300d03cf2..f0d985a56a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedInsertUpdateSameTransactionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedInsertUpdateSameTransactionTest.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.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.integration.basic.BasicTestEntity1; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.basic.BasicTestEntity1; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedManualFlush.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManualFlush.java similarity index 84% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedManualFlush.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManualFlush.java index f7cd264d4c..055acd3c30 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedManualFlush.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManualFlush.java @@ -4,19 +4,19 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.integration.basic.BasicTestEntity1; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.basic.BasicTestEntity1; import org.hibernate.testing.TestForIssue; import org.junit.Test; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; import static org.junit.Assert.assertEquals; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedManyToOneInComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManyToOneInComponent.java similarity index 80% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedManyToOneInComponent.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManyToOneInComponent.java index 105790a35e..f0a7b3b340 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedManyToOneInComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedManyToOneInComponent.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.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.components.relations.ManyToOneComponent; -import org.hibernate.envers.test.entities.components.relations.ManyToOneComponentTestEntity; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.components.relations.ManyToOneComponent; +import org.hibernate.orm.test.envers.entities.components.relations.ManyToOneComponentTestEntity; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedMergeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedMergeTest.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedMergeTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedMergeTest.java index fedf8446ed..504811ab71 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedMergeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedMergeTest.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.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.ArrayList; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.onetomany.ListRefEdEntity; -import org.hibernate.envers.test.entities.onetomany.ListRefIngEntity; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.onetomany.ListRefEdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.ListRefIngEntity; import org.hibernate.testing.TestForIssue; import org.junit.Test; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; import static org.junit.Assert.assertEquals; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNullProperties.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedNullProperties.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNullProperties.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedNullProperties.java index 52fa7aac45..c43ae89a95 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNullProperties.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedNullProperties.java @@ -4,20 +4,20 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; import javax.persistence.EntityManager; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.integration.basic.BasicTestEntity1; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.basic.BasicTestEntity1; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedOneToManyInComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedOneToManyInComponent.java similarity index 80% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedOneToManyInComponent.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedOneToManyInComponent.java index 5673593b78..acb4be0565 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedOneToManyInComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedOneToManyInComponent.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.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.components.relations.OneToManyComponent; -import org.hibernate.envers.test.entities.components.relations.OneToManyComponentTestEntity; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.components.relations.OneToManyComponent; +import org.hibernate.orm.test.envers.entities.components.relations.OneToManyComponentTestEntity; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringMap.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringMap.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringMap.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringMap.java index 9d96bdd461..ddeffbccc5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringMap.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringMap.java @@ -4,19 +4,19 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.collection.StringMapEntity; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.collection.StringMapEntity; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringSet.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringSet.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringSet.java index e696687ef0..6915269fcb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedStringSet.java @@ -4,19 +4,19 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.collection.StringSetEntity; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.collection.StringSetEntity; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedUnversionedProperties.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedUnversionedProperties.java similarity index 85% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedUnversionedProperties.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedUnversionedProperties.java index c6e180f9c4..0734117771 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedUnversionedProperties.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedUnversionedProperties.java @@ -4,18 +4,18 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.integration.basic.BasicTestEntity2; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.basic.BasicTestEntity2; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/ModifiedFlagSuffix.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/ModifiedFlagSuffix.java similarity index 83% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/ModifiedFlagSuffix.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/ModifiedFlagSuffix.java index 6dd5462b0e..da6e50b46c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/ModifiedFlagSuffix.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/ModifiedFlagSuffix.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.modifiedflags; +package org.hibernate.orm.test.envers.integration.modifiedflags; import java.util.List; import java.util.Map; @@ -12,15 +12,15 @@ import javax.persistence.EntityManager; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.integration.basic.BasicTestEntity1; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.basic.BasicTestEntity1; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; -import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.hibernate.orm.test.envers.tools.TestTools.extractRevisionNumbers; +import static org.hibernate.orm.test.envers.tools.TestTools.makeList; /** * @author Adam Warski (adam at warski dot org) @@ -62,7 +62,7 @@ public class ModifiedFlagSuffix extends AbstractModifiedFlagsEntityTest { TestTools.makeSet( "str1_CHANGED", "long1_CHANGED" ), TestTools.extractModProperties( metadata().getEntityBinding( - "org.hibernate.envers.test.integration.basic.BasicTestEntity1_AUD" + "org.hibernate.orm.test.envers.integration.basic.BasicTestEntity1_AUD" ), "_CHANGED" ) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/EnumEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/EnumEntity.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/EnumEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/EnumEntity.java index 27dec95acd..8961fd921f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/EnumEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/EnumEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.modifiedflags.entities; +package org.hibernate.orm.test.envers.integration.modifiedflags.entities; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/EnumOption.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/EnumOption.java similarity index 80% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/EnumOption.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/EnumOption.java index bffb7c70ce..0b64357e29 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/EnumOption.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/EnumOption.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.modifiedflags.entities; +package org.hibernate.orm.test.envers.integration.modifiedflags.entities; /** * @author Chris Cranford diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java index a4098c03bc..6fd4c4d312 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.modifiedflags.entities; +package org.hibernate.orm.test.envers.integration.modifiedflags.entities; import java.util.HashMap; import java.util.HashSet; @@ -23,9 +23,9 @@ import javax.persistence.Table; import org.hibernate.envers.AuditJoinTable; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.components.Component1; -import org.hibernate.envers.test.entities.components.Component2; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.components.Component1; +import org.hibernate.orm.test.envers.entities.components.Component2; /** * @author Michal Skowronek (mskowr at o2 dot pl) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/Professor.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Professor.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/Professor.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Professor.java index cbf323ed81..06ace8b442 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/Professor.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Professor.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.modifiedflags.entities; +package org.hibernate.orm.test.envers.integration.modifiedflags.entities; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/Student.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Student.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/Student.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Student.java index d01fab5d0f..e8a33e126e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/Student.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/Student.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.modifiedflags.entities; +package org.hibernate.orm.test.envers.integration.modifiedflags.entities; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java index e3ea2a8c77..e831558d57 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.modifiedflags.entities; +package org.hibernate.orm.test.envers.integration.modifiedflags.entities; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/multiplerelations/Address.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Address.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/multiplerelations/Address.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Address.java index 7a4afd4e88..d386e48db9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/multiplerelations/Address.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Address.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.multiplerelations; +package org.hibernate.orm.test.envers.integration.multiplerelations; import java.io.Serializable; import java.util.HashSet; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/multiplerelations/GroupMemberTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/GroupMemberTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/multiplerelations/GroupMemberTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/GroupMemberTest.java index efc6f94db1..b46d8350d9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/multiplerelations/GroupMemberTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/GroupMemberTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.multiplerelations; +package org.hibernate.orm.test.envers.integration.multiplerelations; import java.util.ArrayList; import java.util.HashSet; @@ -24,10 +24,9 @@ import javax.persistence.Query; import org.hibernate.Session; import org.hibernate.envers.AuditMappedBy; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.type.IntegerType; -import org.hibernate.type.Type; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.transaction.TransactionUtil; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/multiplerelations/MultipleAssociationsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/MultipleAssociationsTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/multiplerelations/MultipleAssociationsTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/MultipleAssociationsTest.java index 415b15879d..dec760238d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/multiplerelations/MultipleAssociationsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/MultipleAssociationsTest.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.envers.test.integration.multiplerelations; +package org.hibernate.orm.test.envers.integration.multiplerelations; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/multiplerelations/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Person.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/multiplerelations/Person.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/Person.java index 3921980103..b0297be200 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/multiplerelations/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/multiplerelations/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.envers.test.integration.multiplerelations; +package org.hibernate.orm.test.envers.integration.multiplerelations; import java.io.Serializable; import java.util.HashSet; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/BasicNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/BasicNaming.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/BasicNaming.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/BasicNaming.java index 78dd242d25..f626c3d8df 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/BasicNaming.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/BasicNaming.java @@ -4,13 +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.envers.test.integration.naming; +package org.hibernate.orm.test.envers.integration.naming; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; @@ -93,7 +93,7 @@ public class BasicNaming extends BaseEnversJPAFunctionalTestCase { @Test public void testTableName() { assert "naming_test_entity_1_versions".equals( - metadata().getEntityBinding( "org.hibernate.envers.test.integration.naming.NamingTestEntity1_AUD" ).getTable().getName() + metadata().getEntityBinding( "org.hibernate.orm.test.envers.integration.naming.NamingTestEntity1_AUD" ).getTable().getName() ); } } diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/DetachedNamingTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/DetachedNamingTestEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/DetachedNamingTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/DetachedNamingTestEntity.java index 24de885a36..facbb8ea8b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/DetachedNamingTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/DetachedNamingTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.naming; +package org.hibernate.orm.test.envers.integration.naming; import java.util.Set; import javax.persistence.Entity; @@ -14,7 +14,7 @@ import javax.persistence.JoinTable; import javax.persistence.OneToMany; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntity; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/EstonianTableAlias.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/EstonianTableAlias.java similarity index 86% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/EstonianTableAlias.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/EstonianTableAlias.java index 7bc2c27ace..b2d018ada8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/EstonianTableAlias.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/EstonianTableAlias.java @@ -4,13 +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.envers.test.integration.naming; +package org.hibernate.orm.test.envers.integration.naming; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNaming.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNaming.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNaming.java index 2a7e12a2b0..b77741bb7e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNaming.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNaming.java @@ -4,15 +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.envers.test.integration.naming; +package org.hibernate.orm.test.envers.integration.naming; import java.util.Arrays; import java.util.Iterator; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.mapping.Column; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.mapping.Selectable; import org.junit.Test; @@ -113,7 +112,7 @@ public class JoinNaming extends BaseEnversJPAFunctionalTestCase { @Test public void testJoinColumnName() { Iterator columns = metadata().getEntityBinding( - "org.hibernate.envers.test.integration.naming.JoinNamingRefIngEntity_AUD" + "org.hibernate.orm.test.envers.integration.naming.JoinNamingRefIngEntity_AUD" ).getProperty( "reference_id" ).getColumnIterator(); assertTrue( columns.hasNext() ); assertEquals( "jnree_column_reference", columns.next().getText() ); diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNamingRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefEdEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNamingRefEdEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefEdEntity.java index dee2ed8ce0..17031e0b5a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNamingRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefEdEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.naming; +package org.hibernate.orm.test.envers.integration.naming; import java.util.List; import javax.persistence.Column; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNamingRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefIngEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNamingRefIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefIngEntity.java index 12b3847b38..90e72034cf 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNamingRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/JoinNamingRefIngEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.naming; +package org.hibernate.orm.test.envers.integration.naming; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/NamingTestEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity1.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/NamingTestEntity1.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity1.java index 1ffb1127f5..1c9967d8fd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/NamingTestEntity1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity1.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.naming; +package org.hibernate.orm.test.envers.integration.naming; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/NamingTestEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity2.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/NamingTestEntity2.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity2.java index 701374bed3..93512e7037 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/NamingTestEntity2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/NamingTestEntity2.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.naming; +package org.hibernate.orm.test.envers.integration.naming; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/OneToManyUnidirectionalNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/OneToManyUnidirectionalNaming.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/OneToManyUnidirectionalNaming.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/OneToManyUnidirectionalNaming.java index 51eda743a3..0eccc5b352 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/OneToManyUnidirectionalNaming.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/OneToManyUnidirectionalNaming.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.envers.test.integration.naming; +package org.hibernate.orm.test.envers.integration.naming; import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.mapping.Column; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableNaming.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableNaming.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableNaming.java index 8b8f65eded..c244a1fe01 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableNaming.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableNaming.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.envers.test.integration.naming; +package org.hibernate.orm.test.envers.integration.naming; import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.mapping.Column; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponent.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponent.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponent.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponent.java index 14d078c421..e13230dcc9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponent.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.naming; +package org.hibernate.orm.test.envers.integration.naming; import java.util.ArrayList; import java.util.List; @@ -40,7 +40,7 @@ public final class VersionsJoinTableRangeComponent getRange() { + public List getRange() { return this.range; } diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponentTestEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponentTestEntity.java index c060167a52..6fbb94c4d4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeComponentTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.naming; +package org.hibernate.orm.test.envers.integration.naming; import javax.persistence.AssociationOverride; import javax.persistence.AttributeOverride; @@ -19,7 +19,7 @@ import javax.persistence.Table; import org.hibernate.envers.AuditOverride; import org.hibernate.envers.AuditOverrides; -import org.hibernate.envers.test.entities.components.Component1; +import org.hibernate.orm.test.envers.entities.components.Component1; /** * Test entity, containing two embedded components, which each contain a list of diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestAlternateEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestAlternateEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestAlternateEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestAlternateEntity.java index 2ffdb5cdd5..7a46b29051 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestAlternateEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestAlternateEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.naming; +package org.hibernate.orm.test.envers.integration.naming; import javax.persistence.Entity; import javax.persistence.Table; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntity.java index 31b1e4b9ea..ec2729b259 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.naming; +package org.hibernate.orm.test.envers.integration.naming; import javax.persistence.Entity; import javax.persistence.Table; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestEntitySuperClass.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntitySuperClass.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestEntitySuperClass.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntitySuperClass.java index e9d2f000fc..c293ae17cd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestEntitySuperClass.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableRangeTestEntitySuperClass.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.naming; +package org.hibernate.orm.test.envers.integration.naming; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableTestEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableTestEntity.java index c22ddc0fe6..608bce8280 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/VersionsJoinTableTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.naming; +package org.hibernate.orm.test.envers.integration.naming; import java.util.Set; import javax.persistence.Entity; @@ -15,7 +15,7 @@ import javax.persistence.Table; import org.hibernate.envers.AuditJoinTable; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntity; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/EmbIdNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/EmbIdNaming.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/EmbIdNaming.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/EmbIdNaming.java index 8c4750280d..d70cf325a3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/EmbIdNaming.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/EmbIdNaming.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.naming.ids; +package org.hibernate.orm.test.envers.integration.naming.ids; import java.io.Serializable; import javax.persistence.Column; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNaming.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNaming.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNaming.java index a8b262426f..c5e2211c6b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNaming.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNaming.java @@ -4,15 +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.envers.test.integration.naming.ids; +package org.hibernate.orm.test.envers.integration.naming.ids; import java.util.Arrays; import java.util.Iterator; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.mapping.Column; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.mapping.Selectable; import org.junit.Test; @@ -126,7 +125,7 @@ public class JoinEmbIdNaming extends BaseEnversJPAFunctionalTestCase { @Test public void testJoinColumnNames() { Iterator columns = metadata().getEntityBinding( - "org.hibernate.envers.test.integration.naming.ids.JoinEmbIdNamingRefIngEntity_AUD" + "org.hibernate.orm.test.envers.integration.naming.ids.JoinEmbIdNamingRefIngEntity_AUD" ).getProperty( "reference_x" ).getColumnIterator(); assertTrue( columns.hasNext() ); @@ -134,7 +133,7 @@ public class JoinEmbIdNaming extends BaseEnversJPAFunctionalTestCase { assertFalse( columns.hasNext() ); columns = metadata().getEntityBinding( - "org.hibernate.envers.test.integration.naming.ids.JoinEmbIdNamingRefIngEntity_AUD" + "org.hibernate.orm.test.envers.integration.naming.ids.JoinEmbIdNamingRefIngEntity_AUD" ).getProperty( "reference_y" ).getColumnIterator(); assertTrue( columns.hasNext() ); diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java index e059fe313f..7c92db86eb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.naming.ids; +package org.hibernate.orm.test.envers.integration.naming.ids; import java.util.List; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java index cf27d674ea..203d6298ba 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.naming.ids; +package org.hibernate.orm.test.envers.integration.naming.ids; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNaming.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNaming.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNaming.java index 88f8c413c8..7f38680746 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNaming.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNaming.java @@ -4,15 +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.envers.test.integration.naming.ids; +package org.hibernate.orm.test.envers.integration.naming.ids; import java.util.Arrays; import java.util.Iterator; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.mapping.Column; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.mapping.Selectable; import org.junit.Test; @@ -126,7 +125,7 @@ public class JoinMulIdNaming extends BaseEnversJPAFunctionalTestCase { @Test public void testJoinColumnNames() { Iterator columns = metadata().getEntityBinding( - "org.hibernate.envers.test.integration.naming.ids.JoinMulIdNamingRefIngEntity_AUD" + "org.hibernate.orm.test.envers.integration.naming.ids.JoinMulIdNamingRefIngEntity_AUD" ).getProperty( "reference_id1" ).getColumnIterator(); assertTrue( columns.hasNext() ); @@ -134,7 +133,7 @@ public class JoinMulIdNaming extends BaseEnversJPAFunctionalTestCase { assertFalse( columns.hasNext() ); columns = metadata().getEntityBinding( - "org.hibernate.envers.test.integration.naming.ids.JoinMulIdNamingRefIngEntity_AUD" + "org.hibernate.orm.test.envers.integration.naming.ids.JoinMulIdNamingRefIngEntity_AUD" ).getProperty( "reference_id2" ).getColumnIterator(); assertTrue( columns.hasNext() ); diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefEdEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefEdEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefEdEntity.java index 54b53a7f73..10120ff0a4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefEdEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.naming.ids; +package org.hibernate.orm.test.envers.integration.naming.ids; import java.util.List; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefIngEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefIngEntity.java index adff6fac6b..7a99dee8c3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/JoinMulIdNamingRefIngEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.naming.ids; +package org.hibernate.orm.test.envers.integration.naming.ids; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/MulIdNaming.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/MulIdNaming.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/MulIdNaming.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/MulIdNaming.java index e151abaee1..99edaab7b4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/MulIdNaming.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/ids/MulIdNaming.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.naming.ids; +package org.hibernate.orm.test.envers.integration.naming.ids; import java.io.Serializable; import javax.persistence.Column; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/quotation/QuotedFieldsEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/quotation/QuotedFieldsEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsEntity.java index b223663c46..3f53f7a1c5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/quotation/QuotedFieldsEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.naming.quotation; +package org.hibernate.orm.test.envers.integration.naming.quotation; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/quotation/QuotedFieldsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsTest.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/quotation/QuotedFieldsTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsTest.java index 6e71684ad8..4cd6f9f90f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/quotation/QuotedFieldsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/naming/quotation/QuotedFieldsTest.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.envers.test.integration.naming.quotation; +package org.hibernate.orm.test.envers.integration.naming.quotation; import java.util.Arrays; import java.util.Iterator; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; @@ -87,7 +87,7 @@ public class QuotedFieldsTest extends BaseEnversJPAFunctionalTestCase { @Test public void testEscapeEntityField() { Table table = metadata().getEntityBinding( - "org.hibernate.envers.test.integration.naming.quotation.QuotedFieldsEntity_AUD" + "org.hibernate.orm.test.envers.integration.naming.quotation.QuotedFieldsEntity_AUD" ).getTable(); Column column1 = getColumnByName( table, "id" ); Column column2 = getColumnByName( table, "data1" ); diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/NotInsertable.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertable.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/NotInsertable.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertable.java index 478ccf8a1f..fbc415cb91 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/NotInsertable.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertable.java @@ -4,13 +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.envers.test.integration.notinsertable; +package org.hibernate.orm.test.envers.integration.notinsertable; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/NotInsertableTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertableTestEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/NotInsertableTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertableTestEntity.java index 10875e9048..c3e32fe465 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/NotInsertableTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/NotInsertableTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.notinsertable; +package org.hibernate.orm.test.envers.integration.notinsertable; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/manytoone/ManyToOneNotInsertable.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertable.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/manytoone/ManyToOneNotInsertable.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertable.java index e11798543d..c3369cec0e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/manytoone/ManyToOneNotInsertable.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertable.java @@ -4,13 +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.envers.test.integration.notinsertable.manytoone; +package org.hibernate.orm.test.envers.integration.notinsertable.manytoone; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/manytoone/ManyToOneNotInsertableEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertableEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/manytoone/ManyToOneNotInsertableEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertableEntity.java index d590cdd1a5..a487a5bdd6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/manytoone/ManyToOneNotInsertableEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/ManyToOneNotInsertableEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.notinsertable.manytoone; +package org.hibernate.orm.test.envers.integration.notinsertable.manytoone; import javax.persistence.Basic; import javax.persistence.Column; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/manytoone/NotInsertableEntityType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/NotInsertableEntityType.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/manytoone/NotInsertableEntityType.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/NotInsertableEntityType.java index af7f684900..c4a671f45e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/manytoone/NotInsertableEntityType.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/notinsertable/manytoone/NotInsertableEntityType.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.notinsertable.manytoone; +package org.hibernate.orm.test.envers.integration.notinsertable.manytoone; import javax.persistence.Basic; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicCollection.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicCollection.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicCollection.java index b142614e04..03f8752010 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicCollection.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany; +package org.hibernate.orm.test.envers.integration.onetomany; import java.util.Arrays; import java.util.Collections; @@ -12,10 +12,10 @@ import java.util.HashSet; import java.util.Set; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.onetomany.CollectionRefEdEntity; -import org.hibernate.envers.test.entities.onetomany.CollectionRefIngEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.onetomany.CollectionRefEdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.CollectionRefIngEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicList.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicList.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicList.java index 926da1b807..26e1c11d62 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicList.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicList.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany; +package org.hibernate.orm.test.envers.integration.onetomany; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.onetomany.ListRefEdEntity; -import org.hibernate.envers.test.entities.onetomany.ListRefIngEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.onetomany.ListRefEdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.ListRefIngEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSet.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSet.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSet.java index 06954108df..806f142571 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSet.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.envers.test.integration.onetomany; +package org.hibernate.orm.test.envers.integration.onetomany; import java.util.Arrays; import java.util.Collections; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.onetomany.SetRefEdEntity; -import org.hibernate.envers.test.entities.onetomany.SetRefIngEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.onetomany.SetRefEdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.SetRefIngEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithEmbId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithEmbId.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithEmbId.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithEmbId.java index 0eb140b8c0..05c788f6bc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithEmbId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithEmbId.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany; +package org.hibernate.orm.test.envers.integration.onetomany; import java.util.Arrays; import java.util.Collections; @@ -12,11 +12,11 @@ import java.util.HashSet; import java.util.Set; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.ids.EmbId; -import org.hibernate.envers.test.entities.onetomany.ids.SetRefEdEmbIdEntity; -import org.hibernate.envers.test.entities.onetomany.ids.SetRefIngEmbIdEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.ids.EmbId; +import org.hibernate.orm.test.envers.entities.onetomany.ids.SetRefEdEmbIdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.ids.SetRefIngEmbIdEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithMulId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithMulId.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithMulId.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithMulId.java index 4cf7e28aaf..043d539c59 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithMulId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithMulId.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany; +package org.hibernate.orm.test.envers.integration.onetomany; import java.util.Arrays; import java.util.Collections; @@ -12,11 +12,11 @@ import java.util.HashSet; import java.util.Set; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.ids.MulId; -import org.hibernate.envers.test.entities.onetomany.ids.SetRefEdMulIdEntity; -import org.hibernate.envers.test.entities.onetomany.ids.SetRefIngMulIdEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.ids.MulId; +import org.hibernate.orm.test.envers.entities.onetomany.ids.SetRefEdMulIdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.ids.SetRefIngMulIdEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithNullsDelete.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithNullsDelete.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithNullsDelete.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithNullsDelete.java index e900f79e32..612d527b12 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithNullsDelete.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicSetWithNullsDelete.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany; +package org.hibernate.orm.test.envers.integration.onetomany; import java.util.Arrays; import java.util.Collections; @@ -12,10 +12,10 @@ import java.util.HashSet; import java.util.Set; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.onetomany.SetRefEdEntity; -import org.hibernate.envers.test.entities.onetomany.SetRefIngEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.onetomany.SetRefEdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.SetRefIngEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BidirectionalMapKey.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BidirectionalMapKey.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BidirectionalMapKey.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BidirectionalMapKey.java index 98b41ee5c4..812cf18b10 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BidirectionalMapKey.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BidirectionalMapKey.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.envers.test.integration.onetomany; +package org.hibernate.orm.test.envers.integration.onetomany; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/IndexColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/IndexColumnListTest.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/IndexColumnListTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/IndexColumnListTest.java index 810cc6bd81..aafedc0566 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/IndexColumnListTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/IndexColumnListTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany; +package org.hibernate.orm.test.envers.integration.onetomany; import java.util.ArrayList; import java.util.Arrays; @@ -16,8 +16,8 @@ import javax.persistence.OneToMany; import javax.persistence.OrderColumn; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.transaction.TransactionUtil; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/InverseSideChanges.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/InverseSideChanges.java similarity index 85% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/InverseSideChanges.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/InverseSideChanges.java index 8532bb5dac..09956dbe6e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/InverseSideChanges.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/InverseSideChanges.java @@ -5,17 +5,17 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany; +package org.hibernate.orm.test.envers.integration.onetomany; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.onetomany.SetRefEdEntity; -import org.hibernate.envers.test.entities.onetomany.SetRefIngEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.onetomany.SetRefEdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.SetRefIngEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/OrderColumnListTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/OrderColumnListTest.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/OrderColumnListTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/OrderColumnListTest.java index fa15828c8d..6b360a9395 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/OrderColumnListTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/OrderColumnListTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany; +package org.hibernate.orm.test.envers.integration.onetomany; import java.util.ArrayList; import java.util.Arrays; @@ -17,8 +17,8 @@ import javax.persistence.OneToMany; import javax.persistence.OrderColumn; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/RefEdMapKeyEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefEdMapKeyEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/RefEdMapKeyEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefEdMapKeyEntity.java index d5564e81ba..faf55a5352 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/RefEdMapKeyEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefEdMapKeyEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany; +package org.hibernate.orm.test.envers.integration.onetomany; import java.util.HashMap; import java.util.Map; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/RefIngMapKeyEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefIngMapKeyEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/RefIngMapKeyEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefIngMapKeyEntity.java index a139e8118b..9f034d904b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/RefIngMapKeyEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/RefIngMapKeyEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany; +package org.hibernate.orm.test.envers.integration.onetomany; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedList.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedList.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedList.java index 0fc9e1c142..27df5a7ada 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedList.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedList.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.envers.test.integration.onetomany.detached; +package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.ArrayList; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.onetomany.detached.ListRefCollEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.onetomany.detached.ListRefCollEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSet.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSet.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSet.java index 05bc1e7fa0..0c62058583 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSet.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.envers.test.integration.onetomany.detached; +package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; import java.util.HashSet; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.onetomany.detached.SetRefCollEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.onetomany.detached.SetRefCollEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSetWithEmbId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithEmbId.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSetWithEmbId.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithEmbId.java index 3345c9b59f..d1b9705fea 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSetWithEmbId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithEmbId.java @@ -4,18 +4,18 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany.detached; +package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; import java.util.HashSet; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.ids.EmbId; -import org.hibernate.envers.test.entities.ids.EmbIdTestEntity; -import org.hibernate.envers.test.entities.onetomany.detached.ids.SetRefCollEntityEmbId; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.ids.EmbId; +import org.hibernate.orm.test.envers.entities.ids.EmbIdTestEntity; +import org.hibernate.orm.test.envers.entities.onetomany.detached.ids.SetRefCollEntityEmbId; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSetWithMulId.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithMulId.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSetWithMulId.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithMulId.java index f772440c57..076d7e6fe8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSetWithMulId.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicDetachedSetWithMulId.java @@ -4,18 +4,18 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany.detached; +package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; import java.util.HashSet; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.ids.MulId; -import org.hibernate.envers.test.entities.ids.MulIdTestEntity; -import org.hibernate.envers.test.entities.onetomany.detached.ids.SetRefCollEntityMulId; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.ids.MulId; +import org.hibernate.orm.test.envers.entities.ids.MulIdTestEntity; +import org.hibernate.orm.test.envers.entities.onetomany.detached.ids.SetRefCollEntityMulId; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicJoinColumnSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicJoinColumnSet.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicJoinColumnSet.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicJoinColumnSet.java index 272a5f078d..af295a3427 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicJoinColumnSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/BasicJoinColumnSet.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.envers.test.integration.onetomany.detached; +package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; import java.util.HashSet; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.onetomany.detached.SetJoinColumnRefCollEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.onetomany.detached.SetJoinColumnRefCollEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DataChangesDetachedSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DataChangesDetachedSet.java similarity index 84% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DataChangesDetachedSet.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DataChangesDetachedSet.java index d4e3ecd793..e32263ec9b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DataChangesDetachedSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DataChangesDetachedSet.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.envers.test.integration.onetomany.detached; +package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; import java.util.HashSet; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.onetomany.detached.SetRefCollEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.onetomany.detached.SetRefCollEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DetachedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DetachedTest.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DetachedTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DetachedTest.java index ab40d9ab30..fe36b824b5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DetachedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DetachedTest.java @@ -4,15 +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.envers.test.integration.onetomany.detached; +package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; import org.hibernate.Session; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.onetomany.detached.ListRefCollEntity; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.onetomany.detached.ListRefCollEntity; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DoubleDetachedSet.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleDetachedSet.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DoubleDetachedSet.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleDetachedSet.java index 7d90f1ddab..6fd26aa9c0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DoubleDetachedSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleDetachedSet.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.envers.test.integration.onetomany.detached; +package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; import java.util.HashSet; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.onetomany.detached.DoubleSetRefCollEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.onetomany.detached.DoubleSetRefCollEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DoubleJoinColumnBidirectionalList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleJoinColumnBidirectionalList.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DoubleJoinColumnBidirectionalList.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleJoinColumnBidirectionalList.java index 6e83abcf78..b1b0883481 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DoubleJoinColumnBidirectionalList.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DoubleJoinColumnBidirectionalList.java @@ -4,20 +4,20 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany.detached; +package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.onetomany.detached.DoubleListJoinColumnBidirectionalRefEdEntity1; -import org.hibernate.envers.test.entities.onetomany.detached.DoubleListJoinColumnBidirectionalRefEdEntity2; -import org.hibernate.envers.test.entities.onetomany.detached.DoubleListJoinColumnBidirectionalRefIngEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.onetomany.detached.DoubleListJoinColumnBidirectionalRefEdEntity1; +import org.hibernate.orm.test.envers.entities.onetomany.detached.DoubleListJoinColumnBidirectionalRefEdEntity2; +import org.hibernate.orm.test.envers.entities.onetomany.detached.DoubleListJoinColumnBidirectionalRefIngEntity; import org.junit.Test; -import static org.hibernate.envers.test.tools.TestTools.checkCollection; +import static org.hibernate.orm.test.envers.tools.TestTools.checkCollection; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/IndexedJoinColumnBidirectionalList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/IndexedJoinColumnBidirectionalList.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/IndexedJoinColumnBidirectionalList.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/IndexedJoinColumnBidirectionalList.java index 22f9d06776..c76ebac3fa 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/IndexedJoinColumnBidirectionalList.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/IndexedJoinColumnBidirectionalList.java @@ -4,15 +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.envers.test.integration.onetomany.detached; +package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.onetomany.detached.IndexedListJoinColumnBidirectionalRefEdEntity; -import org.hibernate.envers.test.entities.onetomany.detached.IndexedListJoinColumnBidirectionalRefIngEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.onetomany.detached.IndexedListJoinColumnBidirectionalRefEdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.detached.IndexedListJoinColumnBidirectionalRefIngEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/JoinColumnBidirectionalList.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalList.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/JoinColumnBidirectionalList.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalList.java index 94f5ffdb31..d38cda44d3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/JoinColumnBidirectionalList.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalList.java @@ -4,19 +4,19 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany.detached; +package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.onetomany.detached.ListJoinColumnBidirectionalRefEdEntity; -import org.hibernate.envers.test.entities.onetomany.detached.ListJoinColumnBidirectionalRefIngEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.onetomany.detached.ListJoinColumnBidirectionalRefEdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.detached.ListJoinColumnBidirectionalRefIngEntity; import org.junit.Test; -import static org.hibernate.envers.test.tools.TestTools.checkCollection; +import static org.hibernate.orm.test.envers.tools.TestTools.checkCollection; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/JoinColumnBidirectionalListWithInheritance.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalListWithInheritance.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/JoinColumnBidirectionalListWithInheritance.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalListWithInheritance.java index 0954aef88e..09ddb50890 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/JoinColumnBidirectionalListWithInheritance.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/JoinColumnBidirectionalListWithInheritance.java @@ -4,20 +4,20 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany.detached; +package org.hibernate.orm.test.envers.integration.onetomany.detached; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.onetomany.detached.ListJoinColumnBidirectionalInheritanceRefEdChildEntity; -import org.hibernate.envers.test.entities.onetomany.detached.ListJoinColumnBidirectionalInheritanceRefEdParentEntity; -import org.hibernate.envers.test.entities.onetomany.detached.ListJoinColumnBidirectionalInheritanceRefIngEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.onetomany.detached.ListJoinColumnBidirectionalInheritanceRefEdChildEntity; +import org.hibernate.orm.test.envers.entities.onetomany.detached.ListJoinColumnBidirectionalInheritanceRefEdParentEntity; +import org.hibernate.orm.test.envers.entities.onetomany.detached.ListJoinColumnBidirectionalInheritanceRefIngEntity; import org.junit.Test; -import static org.hibernate.envers.test.tools.TestTools.checkCollection; +import static org.hibernate.orm.test.envers.tools.TestTools.checkCollection; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/Constant.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Constant.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/Constant.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Constant.java index 19c4c0da0f..81b73e4199 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/Constant.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Constant.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany.embeddedid; +package org.hibernate.orm.test.envers.integration.onetomany.embeddedid; import java.io.Serializable; import javax.persistence.Column; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/OneToManyCompositeKeyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/OneToManyCompositeKeyTest.java similarity index 98% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/OneToManyCompositeKeyTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/OneToManyCompositeKeyTest.java index ab875374ec..6ccff63899 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/OneToManyCompositeKeyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/OneToManyCompositeKeyTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany.embeddedid; +package org.hibernate.orm.test.envers.integration.onetomany.embeddedid; import java.io.Serializable; import java.util.ArrayList; @@ -31,7 +31,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.hibernate.envers.AuditReader; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Person.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/Person.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/Person.java index 0b1be1f75f..a671c2ef94 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/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.envers.test.integration.onetomany.embeddedid; +package org.hibernate.orm.test.envers.integration.onetomany.embeddedid; import java.io.Serializable; import java.util.HashSet; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/PersonTuple.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/PersonTuple.java similarity index 98% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/PersonTuple.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/PersonTuple.java index 68dd07eae8..e225d3360b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/PersonTuple.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/embeddedid/PersonTuple.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany.embeddedid; +package org.hibernate.orm.test.envers.integration.onetomany.embeddedid; import java.io.Serializable; import javax.persistence.Column; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/idclass/ManyToManyCompositeKey.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToManyCompositeKey.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/idclass/ManyToManyCompositeKey.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToManyCompositeKey.java index 937391a65f..438f3a12b4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/idclass/ManyToManyCompositeKey.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToManyCompositeKey.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany.idclass; +package org.hibernate.orm.test.envers.integration.onetomany.idclass; import java.io.Serializable; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/idclass/ManyToOneOwned.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToOneOwned.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/idclass/ManyToOneOwned.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToOneOwned.java index 98913e3f58..70fa14b500 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/idclass/ManyToOneOwned.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/ManyToOneOwned.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany.idclass; +package org.hibernate.orm.test.envers.integration.onetomany.idclass; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/idclass/OneToManyOwned.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/OneToManyOwned.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/idclass/OneToManyOwned.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/OneToManyOwned.java index 030ddea0ef..6ba5bf0cc9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/idclass/OneToManyOwned.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/idclass/OneToManyOwned.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany.idclass; +package org.hibernate.orm.test.envers.integration.onetomany.idclass; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSubclass.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSubclass.java similarity index 86% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSubclass.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSubclass.java index 679a4a5065..3c55da041d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSubclass.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSubclass.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytomany.inverseToSuperclass; +package org.hibernate.orm.test.envers.integration.onetomany.inverseToSuperclass; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSubclass2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSubclass2.java similarity index 86% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSubclass2.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSubclass2.java index ee358f5fa3..5d3bd7143b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSubclass2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSubclass2.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.manytomany.inverseToSuperclass; +package org.hibernate.orm.test.envers.integration.onetomany.inverseToSuperclass; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSuperclass.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSuperclass.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSuperclass.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSuperclass.java index a233389f5e..e2a51a2ca2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSuperclass.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/DetailSuperclass.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany.inverseToSuperclass; +package org.hibernate.orm.test.envers.integration.onetomany.inverseToSuperclass; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java index 84c3b4ca6a..872a7e04cd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java @@ -4,13 +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.envers.test.integration.onetomany.inverseToSuperclass; +package org.hibernate.orm.test.envers.integration.onetomany.inverseToSuperclass; import java.util.ArrayList; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/Root.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/Root.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/Root.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/Root.java index 2d4a0b6591..a3c47580d4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/Root.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/inverseToSuperclass/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.envers.test.integration.manytomany.inverseToSuperclass; +package org.hibernate.orm.test.envers.integration.onetomany.inverseToSuperclass; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/relatedid/AuditRelatedIdInTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/AuditRelatedIdInTest.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/relatedid/AuditRelatedIdInTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/AuditRelatedIdInTest.java index ea50c9c234..135405ed30 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/relatedid/AuditRelatedIdInTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/AuditRelatedIdInTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetomany.relatedid; +package org.hibernate.orm.test.envers.integration.onetomany.relatedid; import java.util.List; @@ -12,9 +12,9 @@ import javax.persistence.EntityManager; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.AuditQuery; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/relatedid/Company.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/Company.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/relatedid/Company.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/Company.java index 89efde4e91..976311ff6b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/relatedid/Company.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/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.envers.test.integration.onetomany.relatedid; +package org.hibernate.orm.test.envers.integration.onetomany.relatedid; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/relatedid/Employee.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/Employee.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/relatedid/Employee.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/Employee.java index fefe694f92..e1ab9c2458 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/relatedid/Employee.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/relatedid/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.envers.test.integration.onetomany.relatedid; +package org.hibernate.orm.test.envers.integration.onetomany.relatedid; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefEdEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefEdEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefEdEntity.java index af8c4e2d33..5bdb8c7f26 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefEdEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetoone.bidirectional; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefIngEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefIngEntity.java index 15567c9942..8455aa119b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefIngEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetoone.bidirectional; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefedOptionalEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefedOptionalEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefedOptionalEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefedOptionalEntity.java index 138aa5b663..261eedfc74 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefedOptionalEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefedOptionalEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetoone.bidirectional; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefingOptionalEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefingOptionalEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefingOptionalEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefingOptionalEntity.java index 268e3b7aa6..094fb340bb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefingOptionalEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BiRefingOptionalEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetoone.bidirectional; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/Bidirectional.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/Bidirectional.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional.java index ae423483e3..e7d920722d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/Bidirectional.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional.java @@ -4,13 +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.envers.test.integration.onetoone.bidirectional; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/Bidirectional2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional2.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/Bidirectional2.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional2.java index 098422776f..ebd95f74c8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/Bidirectional2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/Bidirectional2.java @@ -4,13 +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.envers.test.integration.onetoone.bidirectional; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalEagerAnnotationTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerAnnotationTest.java similarity index 80% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalEagerAnnotationTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerAnnotationTest.java index 94944c91ad..1fb61a0595 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalEagerAnnotationTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerAnnotationTest.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.envers.test.integration.onetoone.bidirectional; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.onetoone.BidirectionalEagerAnnotationRefEdOneToOne; -import org.hibernate.envers.test.entities.onetoone.BidirectionalEagerAnnotationRefIngOneToOne; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.onetoone.BidirectionalEagerAnnotationRefEdOneToOne; +import org.hibernate.orm.test.envers.entities.onetoone.BidirectionalEagerAnnotationRefIngOneToOne; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalEagerHbmTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerHbmTest.java similarity index 79% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalEagerHbmTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerHbmTest.java index bd2d528d53..f27588f24c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalEagerHbmTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalEagerHbmTest.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.envers.test.integration.onetoone.bidirectional; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.onetoone.BidirectionalEagerHbmRefEdPK; -import org.hibernate.envers.test.entities.onetoone.BidirectionalEagerHbmRefIngPK; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.onetoone.BidirectionalEagerHbmRefEdPK; +import org.hibernate.orm.test.envers.entities.onetoone.BidirectionalEagerHbmRefIngPK; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalNoNulls.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalNoNulls.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalNoNulls.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalNoNulls.java index 9cfeef629d..bb7ef0fdda 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalNoNulls.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/BidirectionalNoNulls.java @@ -4,13 +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.envers.test.integration.onetoone.bidirectional; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java index 7c1b5e885d..25ec7ca499 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.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.envers.test.integration.onetoone.bidirectional.ids; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.ids; import javax.persistence.EmbeddedId; import javax.persistence.Entity; import javax.persistence.OneToOne; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.ids.EmbId; +import org.hibernate.orm.test.envers.entities.ids.EmbId; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java index ddd028b25d..cc1a615fa6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.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.envers.test.integration.onetoone.bidirectional.ids; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.ids; import javax.persistence.EmbeddedId; import javax.persistence.Entity; import javax.persistence.OneToOne; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.ids.EmbId; +import org.hibernate.orm.test.envers.entities.ids.EmbId; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java index 6d3267fc20..08e43ab3e7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetoone.bidirectional.ids; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.ids; import javax.persistence.Entity; import javax.persistence.Id; @@ -12,7 +12,7 @@ import javax.persistence.IdClass; import javax.persistence.OneToOne; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.ids.MulId; +import org.hibernate.orm.test.envers.entities.ids.MulId; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java index e6cd835f10..1c89491040 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetoone.bidirectional.ids; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.ids; import javax.persistence.Entity; import javax.persistence.Id; @@ -12,7 +12,7 @@ import javax.persistence.IdClass; import javax.persistence.OneToOne; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.ids.MulId; +import org.hibernate.orm.test.envers.entities.ids.MulId; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java index a2e99fff5a..a8f65433c5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/EmbIdBidirectional.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.envers.test.integration.onetoone.bidirectional.ids; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.ids; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.ids.EmbId; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.ids.EmbId; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/MulIdBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/MulIdBidirectional.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/MulIdBidirectional.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/MulIdBidirectional.java index fcae1a0caa..98d6b23438 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/MulIdBidirectional.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/ids/MulIdBidirectional.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.envers.test.integration.onetoone.bidirectional.ids; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.ids; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.ids.MulId; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.ids.MulId; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java index dc8333e8e8..669fe2c452 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetoone.bidirectional.primarykeyjoincolumn; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.primarykeyjoincolumn; import java.io.Serializable; import javax.persistence.Column; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java index f73879d2c2..8187bf5bf0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetoone.bidirectional.primarykeyjoincolumn; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.primarykeyjoincolumn; import java.io.Serializable; import javax.persistence.Column; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java index 9db04b16d8..6737d3764d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetoone.bidirectional.primarykeyjoincolumn; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.primarykeyjoincolumn; import java.io.Serializable; import javax.persistence.Column; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedProxyPerson.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedProxyPerson.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedProxyPerson.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedProxyPerson.java index 7182b8ecb8..3f0c2d0879 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedProxyPerson.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedProxyPerson.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetoone.bidirectional.primarykeyjoincolumn; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.primarykeyjoincolumn; import java.io.Serializable; import javax.persistence.Column; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java index 69db406ac1..74cdfe5799 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java @@ -4,15 +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.envers.test.integration.onetoone.bidirectional.primarykeyjoincolumn; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.primarykeyjoincolumn; import java.util.Arrays; import javax.persistence.EntityManager; import org.hibernate.envers.RevisionType; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.proxy.HibernateProxy; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java index 2e14445cc2..475f0f2a90 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/primarykeyjoincolumn/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.envers.test.integration.onetoone.bidirectional.primarykeyjoincolumn; +package org.hibernate.orm.test.envers.integration.onetoone.bidirectional.primarykeyjoincolumn; import java.io.Serializable; import javax.persistence.Column; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefEdEntity.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefEdEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefEdEntity.java index 898169c9c8..81d4cae665 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefEdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefEdEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetoone.unidirectional; +package org.hibernate.orm.test.envers.integration.onetoone.unidirectional; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefIngEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngEntity.java index da61221b6d..81615c2363 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.onetoone.unidirectional; +package org.hibernate.orm.test.envers.integration.onetoone.unidirectional; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefIngMulIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngMulIdEntity.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefIngMulIdEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngMulIdEntity.java index e718875596..79d50ec9ec 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefIngMulIdEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UniRefIngMulIdEntity.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.envers.test.integration.onetoone.unidirectional; +package org.hibernate.orm.test.envers.integration.onetoone.unidirectional; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToOne; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.ids.EmbIdTestEntity; +import org.hibernate.orm.test.envers.entities.ids.EmbIdTestEntity; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/Unidirectional.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/Unidirectional.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/Unidirectional.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/Unidirectional.java index fefe0dd919..a100c199b5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/Unidirectional.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/Unidirectional.java @@ -4,13 +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.envers.test.integration.onetoone.unidirectional; +package org.hibernate.orm.test.envers.integration.onetoone.unidirectional; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UnidirectionalMulIdWithNulls.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalMulIdWithNulls.java similarity index 84% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UnidirectionalMulIdWithNulls.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalMulIdWithNulls.java index 4f7c64abda..dee5d9010b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UnidirectionalMulIdWithNulls.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalMulIdWithNulls.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.envers.test.integration.onetoone.unidirectional; +package org.hibernate.orm.test.envers.integration.onetoone.unidirectional; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.ids.EmbId; -import org.hibernate.envers.test.entities.ids.EmbIdTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.ids.EmbId; +import org.hibernate.orm.test.envers.entities.ids.EmbIdTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UnidirectionalWithNulls.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalWithNulls.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UnidirectionalWithNulls.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalWithNulls.java index ab1f4de999..99aa93712d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UnidirectionalWithNulls.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/unidirectional/UnidirectionalWithNulls.java @@ -4,13 +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.envers.test.integration.onetoone.unidirectional; +package org.hibernate.orm.test.envers.integration.onetoone.unidirectional; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/primitive/PrimitiveAddDelete.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/primitive/PrimitiveAddDelete.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/primitive/PrimitiveAddDelete.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/primitive/PrimitiveAddDelete.java index 1f3b4d920f..846460b4b5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/primitive/PrimitiveAddDelete.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/primitive/PrimitiveAddDelete.java @@ -4,15 +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.envers.test.integration.primitive; +package org.hibernate.orm.test.envers.integration.primitive; import java.util.Arrays; import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.PrimitiveTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.PrimitiveTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/PropertiesTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/PropertiesTestEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/PropertiesTestEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/PropertiesTestEntity.java index bbc2af4dba..e225070df4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/PropertiesTestEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/PropertiesTestEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.properties; +package org.hibernate.orm.test.envers.integration.properties; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingField.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingField.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingField.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingField.java index b6dcb3070e..4c37f8e05e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingField.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingField.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.properties; +package org.hibernate.orm.test.envers.integration.properties; import java.util.Arrays; import java.util.Iterator; @@ -12,8 +12,8 @@ import java.util.Map; import javax.persistence.EntityManager; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingFieldEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingFieldEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingFieldEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingFieldEntity.java index 3feecb9aba..9fa1d94511 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingFieldEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/UnversionedOptimisticLockingFieldEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.properties; +package org.hibernate.orm.test.envers.integration.properties; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/VersionsProperties.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/VersionsProperties.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/VersionsProperties.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/VersionsProperties.java index 111cf9564d..47b79ab2cb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/VersionsProperties.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/properties/VersionsProperties.java @@ -4,15 +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.envers.test.integration.properties; +package org.hibernate.orm.test.envers.integration.properties; import java.util.Arrays; import java.util.Map; import javax.persistence.EntityManager; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/AuditedCollectionProxyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/AuditedCollectionProxyTest.java similarity index 86% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/AuditedCollectionProxyTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/AuditedCollectionProxyTest.java index dca02fdd6f..7eba933d0d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/AuditedCollectionProxyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/AuditedCollectionProxyTest.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.envers.test.integration.proxy; +package org.hibernate.orm.test.envers.integration.proxy; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.onetomany.ListRefEdEntity; -import org.hibernate.envers.test.entities.onetomany.ListRefIngEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.onetomany.ListRefEdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.ListRefIngEntity; import org.hibernate.proxy.HibernateProxy; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/ProxyIdentifier.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/ProxyIdentifier.java similarity index 87% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/ProxyIdentifier.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/ProxyIdentifier.java index e7140fa88a..0e863bdb91 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/ProxyIdentifier.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/ProxyIdentifier.java @@ -4,18 +4,18 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.proxy; +package org.hibernate.orm.test.envers.integration.proxy; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.UnversionedStrTestEntity; -import org.hibernate.envers.test.entities.manytomany.unidirectional.ManyToManyNotAuditedNullEntity; -import org.hibernate.envers.test.entities.manytoone.unidirectional.ExtManyToOneNotAuditedNullEntity; -import org.hibernate.envers.test.entities.manytoone.unidirectional.ManyToOneNotAuditedNullEntity; -import org.hibernate.envers.test.entities.manytoone.unidirectional.TargetNotAuditedEntity; -import org.hibernate.envers.test.entities.onetomany.OneToManyNotAuditedNullEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity; +import org.hibernate.orm.test.envers.entities.manytomany.unidirectional.ManyToManyNotAuditedNullEntity; +import org.hibernate.orm.test.envers.entities.manytoone.unidirectional.ExtManyToOneNotAuditedNullEntity; +import org.hibernate.orm.test.envers.entities.manytoone.unidirectional.ManyToOneNotAuditedNullEntity; +import org.hibernate.orm.test.envers.entities.manytoone.unidirectional.TargetNotAuditedEntity; +import org.hibernate.orm.test.envers.entities.onetomany.OneToManyNotAuditedNullEntity; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/QueryingWithProxyObjectTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/QueryingWithProxyObjectTest.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/QueryingWithProxyObjectTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/QueryingWithProxyObjectTest.java index ca570de387..a5447ef999 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/QueryingWithProxyObjectTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/QueryingWithProxyObjectTest.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.envers.test.integration.proxy; +package org.hibernate.orm.test.envers.integration.proxy; import java.util.Arrays; import java.util.List; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/RemovedObjectQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/RemovedObjectQueryTest.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/RemovedObjectQueryTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/RemovedObjectQueryTest.java index 332356e6b2..83f3c08053 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/RemovedObjectQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/RemovedObjectQueryTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.proxy; +package org.hibernate.orm.test.envers.integration.proxy; import java.util.ArrayList; import java.util.HashSet; @@ -18,23 +18,23 @@ import org.hibernate.envers.RevisionType; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.IntTestPrivSeqEntity; -import org.hibernate.envers.test.entities.StrTestPrivSeqEntity; -import org.hibernate.envers.test.entities.UnversionedStrTestEntity; -import org.hibernate.envers.test.entities.collection.StringSetEntity; -import org.hibernate.envers.test.entities.manytomany.ListOwnedEntity; -import org.hibernate.envers.test.entities.manytomany.ListOwningEntity; -import org.hibernate.envers.test.entities.manytomany.SetOwnedEntity; -import org.hibernate.envers.test.entities.manytomany.SetOwningEntity; -import org.hibernate.envers.test.entities.manytomany.unidirectional.M2MIndexedListTargetNotAuditedEntity; -import org.hibernate.envers.test.entities.onetomany.CollectionRefEdEntity; -import org.hibernate.envers.test.entities.onetomany.CollectionRefIngEntity; -import org.hibernate.envers.test.entities.onetomany.SetRefEdEntity; -import org.hibernate.envers.test.entities.onetomany.SetRefIngEntity; -import org.hibernate.envers.test.integration.manytomany.ternary.TernaryMapEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.IntTestPrivSeqEntity; +import org.hibernate.orm.test.envers.entities.StrTestPrivSeqEntity; +import org.hibernate.orm.test.envers.entities.UnversionedStrTestEntity; +import org.hibernate.orm.test.envers.entities.collection.StringSetEntity; +import org.hibernate.orm.test.envers.entities.manytomany.ListOwnedEntity; +import org.hibernate.orm.test.envers.entities.manytomany.ListOwningEntity; +import org.hibernate.orm.test.envers.entities.manytomany.SetOwnedEntity; +import org.hibernate.orm.test.envers.entities.manytomany.SetOwningEntity; +import org.hibernate.orm.test.envers.entities.manytomany.unidirectional.M2MIndexedListTargetNotAuditedEntity; +import org.hibernate.orm.test.envers.entities.onetomany.CollectionRefEdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.CollectionRefIngEntity; +import org.hibernate.orm.test.envers.entities.onetomany.SetRefEdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.SetRefIngEntity; +import org.hibernate.orm.test.envers.integration.manytomany.ternary.TernaryMapEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AbstractEntityWithChangesQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AbstractEntityWithChangesQueryTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AbstractEntityWithChangesQueryTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AbstractEntityWithChangesQueryTest.java index 4a25ef85e4..c664d2d38d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AbstractEntityWithChangesQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AbstractEntityWithChangesQueryTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.query; +package org.hibernate.orm.test.envers.integration.query; import java.util.ArrayList; import java.util.Arrays; @@ -19,9 +19,9 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RevisionType; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AggregateQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AggregateQuery.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AggregateQuery.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AggregateQuery.java index 3396ed02a2..88d5160743 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AggregateQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AggregateQuery.java @@ -4,18 +4,18 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.query; +package org.hibernate.orm.test.envers.integration.query; import java.util.Arrays; import java.util.List; import javax.persistence.EntityManager; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.IntTestEntity; -import org.hibernate.envers.test.entities.ids.UnusualIdNamingEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.IntTestEntity; +import org.hibernate.orm.test.envers.entities.ids.UnusualIdNamingEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AssociationEntitiesModifiedQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationEntitiesModifiedQueryTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AssociationEntitiesModifiedQueryTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationEntitiesModifiedQueryTest.java index 0487682e3a..8ce0ad18f1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AssociationEntitiesModifiedQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationEntitiesModifiedQueryTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.query; +package org.hibernate.orm.test.envers.integration.query; import java.util.List; @@ -15,8 +15,8 @@ import javax.persistence.criteria.JoinType; import org.hibernate.envers.Audited; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AssociationToOneLeftJoinQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToOneLeftJoinQueryTest.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AssociationToOneLeftJoinQueryTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToOneLeftJoinQueryTest.java index b7bfd3fa62..71d48de333 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AssociationToOneLeftJoinQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationToOneLeftJoinQueryTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.query; +package org.hibernate.orm.test.envers.integration.query; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -16,11 +16,11 @@ import javax.persistence.criteria.JoinType; import org.hibernate.envers.AuditReader; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.integration.query.entities.Address; -import org.hibernate.envers.test.integration.query.entities.Car; -import org.hibernate.envers.test.integration.query.entities.Person; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.query.entities.Address; +import org.hibernate.orm.test.envers.integration.query.entities.Car; +import org.hibernate.orm.test.envers.integration.query.entities.Person; import org.junit.Test; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/CustomRevEntityQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/CustomRevEntityQuery.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/CustomRevEntityQuery.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/CustomRevEntityQuery.java index 61c95f2847..2cb98bb34c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/CustomRevEntityQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/CustomRevEntityQuery.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.query; +package org.hibernate.orm.test.envers.integration.query; import java.util.List; import javax.persistence.EntityManager; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrIntTestEntity; -import org.hibernate.envers.test.entities.reventity.CustomRevEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrIntTestEntity; +import org.hibernate.orm.test.envers.entities.reventity.CustomRevEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/DeletedEntities.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/DeletedEntities.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/DeletedEntities.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/DeletedEntities.java index 6fc2d4adaa..be3447bc9a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/DeletedEntities.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/DeletedEntities.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.query; +package org.hibernate.orm.test.envers.integration.query; import java.util.List; import javax.persistence.EntityManager; @@ -12,9 +12,9 @@ import javax.persistence.EntityManager; import org.hibernate.envers.RevisionType; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrIntTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrIntTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/EntityWithChangesQueryNoModifiedFlagTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryNoModifiedFlagTest.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/EntityWithChangesQueryNoModifiedFlagTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryNoModifiedFlagTest.java index 1e11b430f9..a8af00d666 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/EntityWithChangesQueryNoModifiedFlagTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryNoModifiedFlagTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.query; +package org.hibernate.orm.test.envers.integration.query; import org.hibernate.envers.exception.AuditException; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/EntityWithChangesQueryStoreDeletionDataTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryStoreDeletionDataTest.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/EntityWithChangesQueryStoreDeletionDataTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryStoreDeletionDataTest.java index 7ecda5783e..2295a00273 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/EntityWithChangesQueryStoreDeletionDataTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryStoreDeletionDataTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.query; +package org.hibernate.orm.test.envers.integration.query; import java.util.Map; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/EntityWithChangesQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryTest.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/EntityWithChangesQueryTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryTest.java index b014d94e7b..06061681b7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/EntityWithChangesQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/EntityWithChangesQueryTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.query; +package org.hibernate.orm.test.envers.integration.query; import java.util.Map; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/JoinedInheritancePropertyJoinTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/JoinedInheritancePropertyJoinTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/JoinedInheritancePropertyJoinTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/JoinedInheritancePropertyJoinTest.java index 05f546bbe6..ea482f1bdc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/JoinedInheritancePropertyJoinTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/JoinedInheritancePropertyJoinTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.query; +package org.hibernate.orm.test.envers.integration.query; import java.util.List; @@ -16,8 +16,8 @@ import javax.persistence.OneToOne; import javax.persistence.criteria.JoinType; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/MaximalizePropertyQuery.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/MaximalizePropertyQuery.java index b87e3fd004..f48396ef2a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/MaximalizePropertyQuery.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.query; +package org.hibernate.orm.test.envers.integration.query; import java.util.Arrays; import java.util.HashSet; @@ -16,9 +16,9 @@ import org.hibernate.envers.RevisionType; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.criteria.AuditDisjunction; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrIntTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrIntTestEntity; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/NotAuditedQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NotAuditedQueryTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/NotAuditedQueryTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NotAuditedQueryTest.java index 0ef0f619f9..95f0f8dfd0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/NotAuditedQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NotAuditedQueryTest.java @@ -4,13 +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.envers.test.integration.query; +package org.hibernate.orm.test.envers.integration.query; import javax.persistence.Entity; import javax.persistence.Id; import org.hibernate.envers.exception.NotAuditedException; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/NullPropertyQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NullPropertyQuery.java similarity index 84% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/NullPropertyQuery.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NullPropertyQuery.java index ec8bbf0212..799827ae9a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/NullPropertyQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NullPropertyQuery.java @@ -4,19 +4,19 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.query; +package org.hibernate.orm.test.envers.integration.query; import javax.persistence.EntityManager; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrIntTestEntity; -import org.hibernate.envers.test.entities.ids.EmbId; -import org.hibernate.envers.test.entities.onetomany.CollectionRefEdEntity; -import org.hibernate.envers.test.entities.onetomany.CollectionRefIngEntity; -import org.hibernate.envers.test.entities.onetomany.ids.SetRefEdEmbIdEntity; -import org.hibernate.envers.test.entities.onetomany.ids.SetRefIngEmbIdEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrIntTestEntity; +import org.hibernate.orm.test.envers.entities.ids.EmbId; +import org.hibernate.orm.test.envers.entities.onetomany.CollectionRefEdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.CollectionRefIngEntity; +import org.hibernate.orm.test.envers.entities.onetomany.ids.SetRefEdEmbIdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.ids.SetRefIngEmbIdEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/RevisionConstraintQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/RevisionConstraintQuery.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/RevisionConstraintQuery.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/RevisionConstraintQuery.java index 2502f81d98..763410f7ea 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/RevisionConstraintQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/RevisionConstraintQuery.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.query; +package org.hibernate.orm.test.envers.integration.query; import java.util.Arrays; import java.util.HashSet; @@ -13,10 +13,10 @@ import javax.persistence.EntityManager; import org.hibernate.envers.RevisionType; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrIntTestEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrIntTestEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/SimpleQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/SimpleQuery.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/SimpleQuery.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/SimpleQuery.java index dfe63ea797..f48fd82925 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/SimpleQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/SimpleQuery.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.query; +package org.hibernate.orm.test.envers.integration.query; import java.util.Arrays; import java.util.HashSet; @@ -15,14 +15,14 @@ import org.hibernate.envers.RevisionType; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.criteria.MatchMode; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrIntTestEntity; -import org.hibernate.envers.test.entities.ids.EmbId; -import org.hibernate.envers.test.entities.ids.EmbIdTestEntity; -import org.hibernate.envers.test.entities.ids.MulId; -import org.hibernate.envers.test.entities.ids.MulIdTestEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrIntTestEntity; +import org.hibernate.orm.test.envers.entities.ids.EmbId; +import org.hibernate.orm.test.envers.entities.ids.EmbIdTestEntity; +import org.hibernate.orm.test.envers.entities.ids.MulId; +import org.hibernate.orm.test.envers.entities.ids.MulIdTestEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/StoreDeletedData.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/StoreDeletedData.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/StoreDeletedData.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/StoreDeletedData.java index c434836397..c8458d0d34 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/StoreDeletedData.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/StoreDeletedData.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.query; +package org.hibernate.orm.test.envers.integration.query; import java.util.Arrays; import java.util.List; @@ -17,9 +17,9 @@ import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.criteria.AuditCriterion; import org.hibernate.envers.query.criteria.AuditDisjunction; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrIntTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrIntTestEntity; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/embeddables/EmbeddableQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/EmbeddableQuery.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/embeddables/EmbeddableQuery.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/EmbeddableQuery.java index 02dc90031f..489a43a1f9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/embeddables/EmbeddableQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/EmbeddableQuery.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.query.embeddables; +package org.hibernate.orm.test.envers.integration.query.embeddables; import java.util.List; @@ -13,8 +13,8 @@ import javax.persistence.EntityManager; import org.hibernate.envers.exception.AuditException; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.AuditQuery; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/embeddables/NameInfo.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/NameInfo.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/embeddables/NameInfo.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/NameInfo.java index 596a9b3078..6ff744c91f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/embeddables/NameInfo.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/NameInfo.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.query.embeddables; +package org.hibernate.orm.test.envers.integration.query.embeddables; import javax.persistence.Embeddable; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/embeddables/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/Person.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/embeddables/Person.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/Person.java index 33ef1aa56f..d3af09b29b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/embeddables/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/embeddables/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.envers.test.integration.query.embeddables; +package org.hibernate.orm.test.envers.integration.query.embeddables; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/entities/Address.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Address.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/entities/Address.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Address.java index 6cb51d62c7..e10a8b7301 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/entities/Address.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Address.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.query.entities; +package org.hibernate.orm.test.envers.integration.query.entities; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/entities/Car.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Car.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/entities/Car.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Car.java index 8e1dc63c1d..f780be5550 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/entities/Car.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/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.envers.test.integration.query.entities; +package org.hibernate.orm.test.envers.integration.query.entities; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/entities/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Person.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/entities/Person.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/Person.java index 1e3c5afa5a..fa30e81220 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/entities/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/entities/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.envers.test.integration.query.entities; +package org.hibernate.orm.test.envers.integration.query.entities; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reference/BidirectionalReference.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/BidirectionalReference.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reference/BidirectionalReference.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/BidirectionalReference.java index 1af75da80f..feeee812b9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reference/BidirectionalReference.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/BidirectionalReference.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.envers.test.integration.reference; +package org.hibernate.orm.test.envers.integration.reference; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reference/GreetingPO.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingPO.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reference/GreetingPO.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingPO.java index 20205052ad..eea7fbb955 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reference/GreetingPO.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingPO.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reference; +package org.hibernate.orm.test.envers.integration.reference; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reference/GreetingSetPO.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingSetPO.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reference/GreetingSetPO.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingSetPO.java index 3d1b4dc628..78f3f97988 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reference/GreetingSetPO.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reference/GreetingSetPO.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reference; +package org.hibernate.orm.test.envers.integration.reference; import java.util.Set; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CountingRevisionListener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CountingRevisionListener.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CountingRevisionListener.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CountingRevisionListener.java index b767c89dd8..ab35aeebf0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CountingRevisionListener.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CountingRevisionListener.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import org.hibernate.envers.RevisionListener; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/Custom.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Custom.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/Custom.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Custom.java index e4ecafddfe..3f71e24f3c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/Custom.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Custom.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import java.util.Arrays; import java.util.Date; @@ -15,10 +15,10 @@ import javax.persistence.EntityManager; import org.hibernate.envers.AuditReader; import org.hibernate.envers.exception.RevisionDoesNotExistException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.reventity.CustomRevEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.reventity.CustomRevEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomBoxed.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxed.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomBoxed.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxed.java index b96fa3b30d..d470882d04 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomBoxed.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxed.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import java.util.Arrays; import java.util.Date; @@ -15,9 +15,9 @@ import javax.persistence.EntityManager; import org.hibernate.envers.AuditReader; import org.hibernate.envers.exception.RevisionDoesNotExistException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomBoxedRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxedRevEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomBoxedRevEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxedRevEntity.java index 9074eecb58..34803dac5d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomBoxedRevEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxedRevEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomColumnMapping.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomColumnMapping.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomColumnMapping.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomColumnMapping.java index 166938d0a5..dc051fb44e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomColumnMapping.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomColumnMapping.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import java.util.Arrays; import java.util.Date; @@ -12,10 +12,10 @@ import javax.persistence.EntityManager; import org.hibernate.envers.AuditReader; import org.hibernate.envers.exception.RevisionDoesNotExistException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.reventity.CustomRevEntityColumnMapping; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.reventity.CustomRevEntityColumnMapping; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomDate.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomDate.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomDate.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomDate.java index 6004c24881..02272a9cb5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomDate.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomDate.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import java.util.Arrays; import java.util.Date; @@ -13,10 +13,10 @@ import javax.persistence.EntityManager; import org.hibernate.dialect.CockroachDialect; import org.hibernate.envers.AuditReader; import org.hibernate.envers.exception.RevisionDoesNotExistException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.reventity.CustomDateRevEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.reventity.CustomDateRevEntity; import org.hibernate.testing.SkipForDialect; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomNoListener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomNoListener.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomNoListener.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomNoListener.java index 2fe0b3031e..e1df3936f2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomNoListener.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomNoListener.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import java.util.Arrays; import javax.persistence.EntityManager; import org.hibernate.envers.AuditReader; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.reventity.CustomDataRevEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.reventity.CustomDataRevEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomPropertyAccess.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomPropertyAccess.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomPropertyAccess.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomPropertyAccess.java index 2ddbbf6f67..d4b39fc61c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomPropertyAccess.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomPropertyAccess.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import java.util.Arrays; import java.util.Date; @@ -13,10 +13,10 @@ import javax.persistence.EntityManager; import org.hibernate.dialect.CockroachDialect; import org.hibernate.envers.AuditReader; import org.hibernate.envers.exception.RevisionDoesNotExistException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.reventity.CustomPropertyAccessRevEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.reventity.CustomPropertyAccessRevEntity; import org.hibernate.testing.SkipForDialect; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/DifferentDBSchemaTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/DifferentDBSchemaTest.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/DifferentDBSchemaTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/DifferentDBSchemaTest.java index dec36412c0..a1a1aea04e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/DifferentDBSchemaTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/DifferentDBSchemaTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import java.util.Arrays; import java.util.Map; @@ -13,9 +13,9 @@ import javax.persistence.EntityManager; import org.hibernate.cfg.Environment; import org.hibernate.dialect.H2Dialect; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.mapping.Table; import org.hibernate.testing.RequiresDialect; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/ExceptionListener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListener.java similarity index 87% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/ExceptionListener.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListener.java index 15088349a0..d01139830c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/ExceptionListener.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListener.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.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/ExceptionListenerRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListenerRevEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/ExceptionListenerRevEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListenerRevEntity.java index f9439ce577..3fe5e95740 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/ExceptionListenerRevEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ExceptionListenerRevEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/GloballyConfiguredRevListenerTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/GloballyConfiguredRevListenerTest.java similarity index 84% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/GloballyConfiguredRevListenerTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/GloballyConfiguredRevListenerTest.java index 1e104b6ffb..7f8f1e3f22 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/GloballyConfiguredRevListenerTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/GloballyConfiguredRevListenerTest.java @@ -4,15 +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.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import java.util.Map; import javax.persistence.EntityManager; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/Inherited.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Inherited.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/Inherited.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Inherited.java index c7d605162f..dea32de321 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/Inherited.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Inherited.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import java.util.Arrays; import java.util.Date; @@ -16,9 +16,9 @@ import javax.persistence.EntityManager; import org.hibernate.dialect.CockroachDialect; import org.hibernate.envers.AuditReader; import org.hibernate.envers.exception.RevisionDoesNotExistException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.testing.SkipForDialect; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/InheritedRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/InheritedRevEntity.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/InheritedRevEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/InheritedRevEntity.java index a85da3ad74..dc6d0f44f5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/InheritedRevEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/InheritedRevEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/Listener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Listener.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/Listener.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Listener.java index 95372679aa..7ac603536c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/Listener.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Listener.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import java.util.Arrays; import java.util.Date; @@ -15,9 +15,9 @@ import javax.persistence.EntityManager; import org.hibernate.envers.AuditReader; import org.hibernate.envers.exception.RevisionDoesNotExistException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/ListenerRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ListenerRevEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/ListenerRevEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ListenerRevEntity.java index b9b0c9453b..72d8848292 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/ListenerRevEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/ListenerRevEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevNumber.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumber.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevNumber.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumber.java index a53c9712eb..e7c0e31eae 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevNumber.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumber.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import java.util.Arrays; import java.util.HashSet; @@ -13,9 +13,9 @@ import java.util.Set; import javax.persistence.EntityManager; import org.hibernate.envers.AuditReader; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevNumberRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumberRevEntity.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevNumberRevEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumberRevEntity.java index 5e58187dce..10dad3e25b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevNumberRevEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumberRevEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/MonotonicRevisionNumberTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/MonotonicRevisionNumberTest.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/MonotonicRevisionNumberTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/MonotonicRevisionNumberTest.java index 6b9274973d..26221651af 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/MonotonicRevisionNumberTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/MonotonicRevisionNumberTest.java @@ -4,13 +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.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import org.hibernate.dialect.Oracle8iDialect; import org.hibernate.envers.enhanced.OrderedSequenceGenerator; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.entities.StrIntTestEntity; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.entities.StrIntTestEntity; import org.hibernate.id.IdentifierGenerator; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/OverrideCustomRevListenerTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideCustomRevListenerTest.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/OverrideCustomRevListenerTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideCustomRevListenerTest.java index 97de4cb38f..1ef2258763 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/OverrideCustomRevListenerTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideCustomRevListenerTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import org.hibernate.internal.util.collections.ArrayHelper; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/OverrideDefaultRevListenerTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideDefaultRevListenerTest.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/OverrideDefaultRevListenerTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideDefaultRevListenerTest.java index 76d59ab83d..c8d85446f5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/OverrideDefaultRevListenerTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/OverrideDefaultRevListenerTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import org.hibernate.internal.util.collections.ArrayHelper; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/RevisionNumberOverflowTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/RevisionNumberOverflowTest.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/RevisionNumberOverflowTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/RevisionNumberOverflowTest.java index 193ed9678a..dba28a62bd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/RevisionNumberOverflowTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/RevisionNumberOverflowTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import java.util.List; import java.util.Objects; @@ -19,9 +19,9 @@ import org.hibernate.envers.RevisionEntity; import org.hibernate.envers.RevisionNumber; import org.hibernate.envers.RevisionTimestamp; import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.id.enhanced.TableGenerator; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/TestExceptionRevisionListener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/TestExceptionRevisionListener.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/TestExceptionRevisionListener.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/TestExceptionRevisionListener.java index 910f9e08e3..18c1771f03 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/TestExceptionRevisionListener.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/TestExceptionRevisionListener.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import org.hibernate.envers.RevisionListener; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/TestRevisionListener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/TestRevisionListener.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/TestRevisionListener.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/TestRevisionListener.java index 2fa9836fe6..91f31f361b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/TestRevisionListener.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/TestRevisionListener.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity; +package org.hibernate.orm.test.envers.integration.reventity; import org.hibernate.envers.RevisionListener; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/removal/AbstractRevisionEntityRemovalTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/AbstractRevisionEntityRemovalTest.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/removal/AbstractRevisionEntityRemovalTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/AbstractRevisionEntityRemovalTest.java index 45feb75b0d..ceab26230c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/removal/AbstractRevisionEntityRemovalTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/AbstractRevisionEntityRemovalTest.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.envers.test.integration.reventity.removal; +package org.hibernate.orm.test.envers.integration.reventity.removal; import java.util.ArrayList; import java.util.Map; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.manytomany.ListOwnedEntity; -import org.hibernate.envers.test.entities.manytomany.ListOwningEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.manytomany.ListOwnedEntity; +import org.hibernate.orm.test.envers.entities.manytomany.ListOwningEntity; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/removal/RemoveDefaultRevisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/RemoveDefaultRevisionEntity.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/removal/RemoveDefaultRevisionEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/RemoveDefaultRevisionEntity.java index f5a348f180..f2b648d136 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/removal/RemoveDefaultRevisionEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/RemoveDefaultRevisionEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity.removal; +package org.hibernate.orm.test.envers.integration.reventity.removal; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/removal/RemoveTrackingRevisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/RemoveTrackingRevisionEntity.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/removal/RemoveTrackingRevisionEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/RemoveTrackingRevisionEntity.java index 9653c6372d..45a4e3072c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/removal/RemoveTrackingRevisionEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/RemoveTrackingRevisionEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity.removal; +package org.hibernate.orm.test.envers.integration.reventity.removal; import java.util.Map; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java similarity index 84% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java index 6f3b96a8fc..ad2b5d8ca7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java @@ -4,13 +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.envers.test.integration.reventity.trackmodifiedentities; +package org.hibernate.orm.test.envers.integration.reventity.trackmodifiedentities; import java.util.Map; import org.hibernate.envers.ModifiedEntityNames; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.test.entities.reventity.trackmodifiedentities.AnnotatedTrackingRevisionEntity; +import org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities.AnnotatedTrackingRevisionEntity; import org.hibernate.internal.util.collections.ArrayHelper; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java similarity index 84% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java index f0729a2dea..34e6fc0664 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java @@ -4,20 +4,20 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity.trackmodifiedentities; +package org.hibernate.orm.test.envers.integration.reventity.trackmodifiedentities; import javax.persistence.EntityManager; import org.hibernate.envers.EntityTrackingRevisionListener; import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrIntTestEntity; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.reventity.trackmodifiedentities.CustomTrackingRevisionEntity; -import org.hibernate.envers.test.entities.reventity.trackmodifiedentities.CustomTrackingRevisionListener; -import org.hibernate.envers.test.entities.reventity.trackmodifiedentities.ModifiedEntityTypeEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrIntTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities.CustomTrackingRevisionEntity; +import org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities.CustomTrackingRevisionListener; +import org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities.ModifiedEntityTypeEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java index 65c3aad392..67deb6f7c3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java @@ -4,9 +4,8 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity.trackmodifiedentities; +package org.hibernate.orm.test.envers.integration.reventity.trackmodifiedentities; -import java.util.Iterator; import java.util.List; import java.util.Map; import javax.persistence.EntityManager; @@ -14,11 +13,11 @@ import javax.persistence.EntityManager; import org.hibernate.envers.CrossTypeRevisionChangesReader; import org.hibernate.envers.RevisionType; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrIntTestEntity; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrIntTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.envers.tools.Pair; import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/EntityNamesTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/EntityNamesTest.java similarity index 84% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/EntityNamesTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/EntityNamesTest.java index 13bc61d9c5..37256646c9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/EntityNamesTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/EntityNamesTest.java @@ -4,18 +4,18 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity.trackmodifiedentities; +package org.hibernate.orm.test.envers.integration.reventity.trackmodifiedentities; import java.util.ArrayList; import java.util.List; import java.util.Map; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.integration.entityNames.manyToManyAudited.Car; -import org.hibernate.envers.test.integration.entityNames.manyToManyAudited.Person; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.entityNames.manyToManyAudited.Car; +import org.hibernate.orm.test.envers.integration.entityNames.manyToManyAudited.Person; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.envers.tools.Pair; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java similarity index 82% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java index c03e59f866..1c70c4b5a0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.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.envers.test.integration.reventity.trackmodifiedentities; +package org.hibernate.orm.test.envers.integration.reventity.trackmodifiedentities; import java.util.Map; import org.hibernate.envers.DefaultTrackingModifiedEntitiesRevisionEntity; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.test.entities.reventity.trackmodifiedentities.ExtendedRevisionEntity; -import org.hibernate.envers.test.entities.reventity.trackmodifiedentities.ExtendedRevisionListener; +import org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities.ExtendedRevisionEntity; +import org.hibernate.orm.test.envers.entities.reventity.trackmodifiedentities.ExtendedRevisionListener; import org.hibernate.internal.util.collections.ArrayHelper; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java index 80ee6c4f19..c9ddf87f0d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.reventity.trackmodifiedentities; +package org.hibernate.orm.test.envers.integration.reventity.trackmodifiedentities; import java.util.HashSet; import java.util.Map; @@ -12,10 +12,10 @@ import javax.persistence.EntityManager; import org.hibernate.envers.CrossTypeRevisionChangesReader; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/revfordate/RevisionForDate.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/revfordate/RevisionForDate.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/revfordate/RevisionForDate.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/revfordate/RevisionForDate.java index 4f64723e34..9771f5172a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/revfordate/RevisionForDate.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/revfordate/RevisionForDate.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.revfordate; +package org.hibernate.orm.test.envers.integration.revfordate; import java.util.Date; import javax.persistence.EntityManager; @@ -12,9 +12,9 @@ import javax.persistence.EntityManager; import org.hibernate.dialect.CockroachDialect; import org.hibernate.envers.AuditReader; import org.hibernate.envers.exception.RevisionDoesNotExistException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.testing.SkipForDialect; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIdTestEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity1.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIdTestEntity1.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity1.java index e12ed58869..6c57a7f8b6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIdTestEntity1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity1.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.sameids; +package org.hibernate.orm.test.envers.integration.sameids; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIdTestEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity2.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIdTestEntity2.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity2.java index 785c4d0d86..d57d8a4c1b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIdTestEntity2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIdTestEntity2.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.sameids; +package org.hibernate.orm.test.envers.integration.sameids; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIds.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIds.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIds.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIds.java index 1db05a6219..cf1693cba3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIds.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/sameids/SameIds.java @@ -4,13 +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.envers.test.integration.sameids; +package org.hibernate.orm.test.envers.integration.sameids; import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/serialization/SerializingCollection.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/serialization/SerializingCollection.java similarity index 86% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/serialization/SerializingCollection.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/serialization/SerializingCollection.java index a855d4cf8b..11fa268190 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/serialization/SerializingCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/serialization/SerializingCollection.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.serialization; +package org.hibernate.orm.test.envers.integration.serialization; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -12,10 +12,10 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.onetomany.CollectionRefEdEntity; -import org.hibernate.envers.test.entities.onetomany.CollectionRefIngEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.onetomany.CollectionRefEdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.CollectionRefIngEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/IdentifierReuseTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/IdentifierReuseTest.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/IdentifierReuseTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/IdentifierReuseTest.java index 1f0b4147b7..245e20ed4f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/IdentifierReuseTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/IdentifierReuseTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.strategy; +package org.hibernate.orm.test.envers.integration.strategy; import java.util.Arrays; import java.util.Map; @@ -12,8 +12,8 @@ import javax.persistence.EntityManager; import javax.persistence.EntityTransaction; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.entities.IntNoAutoIdTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.entities.IntNoAutoIdTestEntity; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java index 55211a4e02..2daed06c9a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.strategy; +package org.hibernate.orm.test.envers.integration.strategy; import java.util.ArrayList; import java.util.Arrays; @@ -22,8 +22,8 @@ import javax.persistence.OrderColumn; import org.hibernate.envers.Audited; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.strategy.ValidityAuditStrategy; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyManyToManyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyManyToManyTest.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyManyToManyTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyManyToManyTest.java index f13f6e1c10..8ab4f6f5c1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyManyToManyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyManyToManyTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.strategy; +package org.hibernate.orm.test.envers.integration.strategy; import java.util.Arrays; import java.util.HashSet; @@ -12,10 +12,10 @@ import java.util.Map; import javax.persistence.EntityManager; import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.manytomany.SetOwnedEntity; -import org.hibernate.envers.test.entities.manytomany.SetOwningEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.manytomany.SetOwnedEntity; +import org.hibernate.orm.test.envers.entities.manytomany.SetOwningEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java index 92ea3c7289..54928fcdc4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.strategy; +package org.hibernate.orm.test.envers.integration.strategy; import java.sql.Types; import java.util.Arrays; @@ -19,13 +19,13 @@ import javax.persistence.Query; import org.hibernate.Session; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.strategy.ValidityAuditStrategy; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.manytomany.sametable.Child1Entity; -import org.hibernate.envers.test.entities.manytomany.sametable.Child2Entity; -import org.hibernate.envers.test.entities.manytomany.sametable.ParentEntity; -import org.hibernate.envers.test.entities.reventity.CustomDateRevEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.manytomany.sametable.Child1Entity; +import org.hibernate.orm.test.envers.entities.manytomany.sametable.Child2Entity; +import org.hibernate.orm.test.envers.entities.manytomany.sametable.ParentEntity; +import org.hibernate.orm.test.envers.entities.reventity.CustomDateRevEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Test; @@ -453,7 +453,7 @@ public class ValidityAuditStrategyRevEndTestCustomRevEnt extends BaseEnversJPAFu Class originalEntityClazz, Integer originalEntityId) { // Build the query: // select auditEntity from - // org.hibernate.envers.test.entities.manytomany.sametable.ParentEntity_AUD + // org.hibernate.orm.test.envers.entities.manytomany.sametable.ParentEntity_AUD // auditEntity where auditEntity.originalId.id = :originalEntityId StringBuilder builder = new StringBuilder( "select auditEntity from " ); diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTsTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTsTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTsTest.java index eeb32c4975..a757882214 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTsTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.strategy; +package org.hibernate.orm.test.envers.integration.strategy; import java.sql.Types; import java.util.Arrays; @@ -24,12 +24,12 @@ import org.hibernate.dialect.SybaseASE15Dialect; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; import org.hibernate.envers.strategy.ValidityAuditStrategy; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.manytomany.sametable.Child1Entity; -import org.hibernate.envers.test.entities.manytomany.sametable.Child2Entity; -import org.hibernate.envers.test.entities.manytomany.sametable.ParentEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.manytomany.sametable.Child1Entity; +import org.hibernate.orm.test.envers.entities.manytomany.sametable.Child2Entity; +import org.hibernate.orm.test.envers.entities.manytomany.sametable.ParentEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.junit.Assert; import org.junit.Test; @@ -453,7 +453,7 @@ public class ValidityAuditStrategyRevEndTsTest extends BaseEnversJPAFunctionalTe Class originalEntityClazz, Integer originalEntityId) { // Build the query: // select auditEntity from - // org.hibernate.envers.test.entities.manytomany.sametable.ParentEntity_AUD + // org.hibernate.orm.test.envers.entities.manytomany.sametable.ParentEntity_AUD // auditEntity where auditEntity.originalId.id = :originalEntityId StringBuilder builder = new StringBuilder( "select auditEntity from " ); diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java index 04f64241db..e4aff0ef90 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditAtMethodSuperclassLevel; +package org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel; import javax.persistence.MappedSuperclass; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java index bc47f42e6c..04f7137809 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditAtMethodSuperclassLevel; +package org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java index 2dcb8ec196..aa490bdce3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.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.envers.test.integration.superclass.auditAtMethodSuperclassLevel.auditAllSubclass; +package org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel.auditAllSubclass; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.integration.superclass.auditAtMethodSuperclassLevel.AuditedMethodMappedSuperclass; +import org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel.AuditedMethodMappedSuperclass; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java similarity index 86% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java index 1b656bb473..1ebdde42b5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditAtMethodSuperclassLevel.auditAllSubclass; +package org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel.auditAllSubclass; import java.util.Arrays; import javax.persistence.EntityManager; import org.hibernate.envers.exception.NotAuditedException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.integration.superclass.auditAtMethodSuperclassLevel.AuditedMethodMappedSuperclass; -import org.hibernate.envers.test.integration.superclass.auditAtMethodSuperclassLevel.NotAuditedSubclassEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel.AuditedMethodMappedSuperclass; +import org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel.NotAuditedSubclassEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java index 926aaf6688..95f7d08848 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditAtMethodSuperclassLevel.auditMethodSubclass; +package org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel.auditMethodSubclass; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -12,7 +12,7 @@ import javax.persistence.Id; import javax.persistence.Table; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.integration.superclass.auditAtMethodSuperclassLevel.AuditedMethodMappedSuperclass; +import org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel.AuditedMethodMappedSuperclass; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java similarity index 86% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java index 1635b7a933..9d821965a9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditAtMethodSuperclassLevel.auditMethodSubclass; +package org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel.auditMethodSubclass; import java.util.Arrays; import javax.persistence.EntityManager; import org.hibernate.envers.exception.NotAuditedException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.integration.superclass.auditAtMethodSuperclassLevel.AuditedMethodMappedSuperclass; -import org.hibernate.envers.test.integration.superclass.auditAtMethodSuperclassLevel.NotAuditedSubclassEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel.AuditedMethodMappedSuperclass; +import org.hibernate.orm.test.envers.integration.superclass.auditAtMethodSuperclassLevel.NotAuditedSubclassEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java similarity index 93% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java index 4173855cf8..86e0d1aefd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditedAtSuperclassLevel; +package org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel; import javax.persistence.MappedSuperclass; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java index c4e0b3d966..be80ab7cae 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditedAtSuperclassLevel; +package org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java index 89f5d64a0b..03a053a8a0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.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.envers.test.integration.superclass.auditedAtSuperclassLevel.auditAllSubclass; +package org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel.auditAllSubclass; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.integration.superclass.auditedAtSuperclassLevel.AuditedAllMappedSuperclass; +import org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel.AuditedAllMappedSuperclass; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java similarity index 86% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java index 9c1d3ef642..95a0eec6b9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditedAtSuperclassLevel.auditAllSubclass; +package org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel.auditAllSubclass; import java.util.Arrays; import javax.persistence.EntityManager; import org.hibernate.envers.exception.NotAuditedException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.integration.superclass.auditedAtSuperclassLevel.AuditedAllMappedSuperclass; -import org.hibernate.envers.test.integration.superclass.auditedAtSuperclassLevel.NotAuditedSubclassEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel.AuditedAllMappedSuperclass; +import org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel.NotAuditedSubclassEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java index 1cc416da28..2005d5bcfd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditedAtSuperclassLevel.auditMethodSubclass; +package org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel.auditMethodSubclass; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -12,7 +12,7 @@ import javax.persistence.Id; import javax.persistence.Table; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.integration.superclass.auditedAtSuperclassLevel.AuditedAllMappedSuperclass; +import org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel.AuditedAllMappedSuperclass; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java similarity index 86% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java index 8382df58cb..5e064f986f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditedAtSuperclassLevel.auditMethodSubclass; +package org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel.auditMethodSubclass; import java.util.Arrays; import javax.persistence.EntityManager; import org.hibernate.envers.exception.NotAuditedException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.integration.superclass.auditedAtSuperclassLevel.AuditedAllMappedSuperclass; -import org.hibernate.envers.test.integration.superclass.auditedAtSuperclassLevel.NotAuditedSubclassEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel.AuditedAllMappedSuperclass; +import org.hibernate.orm.test.envers.integration.superclass.auditedAtSuperclassLevel.NotAuditedSubclassEntity; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditClassOverrideTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditClassOverrideTest.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditClassOverrideTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditClassOverrideTest.java index 0d9b492c60..2bf69471d1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditClassOverrideTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditClassOverrideTest.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.envers.test.integration.superclass.auditoverride; +package org.hibernate.orm.test.envers.integration.superclass.auditoverride; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; @@ -56,10 +56,10 @@ public class AuditClassOverrideTest extends BaseEnversJPAFunctionalTestCase { classNotAuditedEntityId = classOverrideNotAuditedEntity.getId(); classAuditedTable = metadata().getEntityBinding( - "org.hibernate.envers.test.integration.superclass.auditoverride.ClassOverrideAuditedEntity_AUD" + "org.hibernate.orm.test.envers.integration.superclass.auditoverride.ClassOverrideAuditedEntity_AUD" ).getTable(); classNotAuditedTable = metadata().getEntityBinding( - "org.hibernate.envers.test.integration.superclass.auditoverride.ClassOverrideNotAuditedEntity_AUD" + "org.hibernate.orm.test.envers.integration.superclass.auditoverride.ClassOverrideNotAuditedEntity_AUD" ).getTable(); } diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditOverrideAuditJoinTableTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditOverrideAuditJoinTableTest.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditOverrideAuditJoinTableTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditOverrideAuditJoinTableTest.java index 6c9ece5fcb..2cba4634f1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditOverrideAuditJoinTableTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditOverrideAuditJoinTableTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditoverride; +package org.hibernate.orm.test.envers.integration.superclass.auditoverride; import java.sql.Timestamp; import java.time.LocalDateTime; @@ -24,13 +24,13 @@ import org.hibernate.envers.AuditOverride; import org.hibernate.envers.AuditOverrides; import org.hibernate.envers.Audited; import org.hibernate.envers.NotAudited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; -import static org.hibernate.envers.test.tools.TestTools.checkCollection; +import static org.hibernate.orm.test.envers.tools.TestTools.checkCollection; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditPropertyOverrideTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditPropertyOverrideTest.java similarity index 87% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditPropertyOverrideTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditPropertyOverrideTest.java index 9cd166067b..b8fae8ab4a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditPropertyOverrideTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditPropertyOverrideTest.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.envers.test.integration.superclass.auditoverride; +package org.hibernate.orm.test.envers.integration.superclass.auditoverride; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; @@ -61,13 +61,13 @@ public class AuditPropertyOverrideTest extends BaseEnversJPAFunctionalTestCase { auditedEntityId = auditedEntity.getId(); propertyTable = metadata().getEntityBinding( - "org.hibernate.envers.test.integration.superclass.auditoverride.PropertyOverrideEntity_AUD" + "org.hibernate.orm.test.envers.integration.superclass.auditoverride.PropertyOverrideEntity_AUD" ).getTable(); transitiveTable = metadata().getEntityBinding( - "org.hibernate.envers.test.integration.superclass.auditoverride.TransitiveOverrideEntity_AUD" + "org.hibernate.orm.test.envers.integration.superclass.auditoverride.TransitiveOverrideEntity_AUD" ).getTable(); auditedTable = metadata().getEntityBinding( - "org.hibernate.envers.test.integration.superclass.auditoverride.AuditedSpecialEntity_AUD" + "org.hibernate.orm.test.envers.integration.superclass.auditoverride.AuditedSpecialEntity_AUD" ).getTable(); } diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedBaseEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedBaseEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedBaseEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedBaseEntity.java index 27ef2deb8e..3a09f98ea0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedBaseEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedBaseEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditoverride; +package org.hibernate.orm.test.envers.integration.superclass.auditoverride; import java.io.Serializable; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedSpecialEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedSpecialEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedSpecialEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedSpecialEntity.java index 1a5c46ae07..916ab641c0 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedSpecialEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/AuditedSpecialEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditoverride; +package org.hibernate.orm.test.envers.integration.superclass.auditoverride; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/BaseEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/BaseEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/BaseEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/BaseEntity.java index 9f538bfbba..510d6d68b7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/BaseEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/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.envers.test.integration.superclass.auditoverride; +package org.hibernate.orm.test.envers.integration.superclass.auditoverride; import java.io.Serializable; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java index 7ec4ebe71c..df8536ee64 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditoverride; +package org.hibernate.orm.test.envers.integration.superclass.auditoverride; import javax.persistence.Entity; import javax.persistence.Table; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java index fc7ec50b8a..c530d49f3d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditoverride; +package org.hibernate.orm.test.envers.integration.superclass.auditoverride; import javax.persistence.Entity; import javax.persistence.Table; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/ExtendedBaseEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ExtendedBaseEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/ExtendedBaseEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ExtendedBaseEntity.java index 15d8bccd73..f6e8e4d5c2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/ExtendedBaseEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/ExtendedBaseEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditoverride; +package org.hibernate.orm.test.envers.integration.superclass.auditoverride; import javax.persistence.MappedSuperclass; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideEntity.java index 82f499911c..d4cf9bec65 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditoverride; +package org.hibernate.orm.test.envers.integration.superclass.auditoverride; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideTest.java similarity index 85% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideTest.java index 626599dbf6..63dde02947 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/MixedOverrideTest.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.envers.test.integration.superclass.auditoverride; +package org.hibernate.orm.test.envers.integration.superclass.auditoverride; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; @@ -43,7 +43,7 @@ public class MixedOverrideTest extends BaseEnversJPAFunctionalTestCase { mixedEntityId = mixedEntity.getId(); mixedTable = metadata().getEntityBinding( - "org.hibernate.envers.test.integration.superclass.auditoverride.MixedOverrideEntity_AUD" + "org.hibernate.orm.test.envers.integration.superclass.auditoverride.MixedOverrideEntity_AUD" ).getTable(); } diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/NotAuditedBaseEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/NotAuditedBaseEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/NotAuditedBaseEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/NotAuditedBaseEntity.java index cffa0e2734..6e2d3eef66 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/NotAuditedBaseEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/NotAuditedBaseEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditoverride; +package org.hibernate.orm.test.envers.integration.superclass.auditoverride; import java.io.Serializable; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/PropertyOverrideEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/PropertyOverrideEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/PropertyOverrideEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/PropertyOverrideEntity.java index 526f8b1d6c..02f32a2c8c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/PropertyOverrideEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/PropertyOverrideEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditoverride; +package org.hibernate.orm.test.envers.integration.superclass.auditoverride; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/TransitiveOverrideEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/TransitiveOverrideEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/TransitiveOverrideEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/TransitiveOverrideEntity.java index 222ec18580..3010f6c2c2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/TransitiveOverrideEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditoverride/TransitiveOverrideEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditoverride; +package org.hibernate.orm.test.envers.integration.superclass.auditoverride; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/BabyCompleteEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/BabyCompleteEntity.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/BabyCompleteEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/BabyCompleteEntity.java index 907d675ba6..33c142c1e7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/BabyCompleteEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/BabyCompleteEntity.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.envers.test.integration.superclass.auditparents; +package org.hibernate.orm.test.envers.integration.superclass.auditparents; import javax.persistence.Entity; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.StrIntTestEntity; +import org.hibernate.orm.test.envers.entities.StrIntTestEntity; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildCompleteEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildCompleteEntity.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildCompleteEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildCompleteEntity.java index da385ab272..257a18ff13 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildCompleteEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildCompleteEntity.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.envers.test.integration.superclass.auditparents; +package org.hibernate.orm.test.envers.integration.superclass.auditparents; import javax.persistence.MappedSuperclass; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.StrIntTestEntity; +import org.hibernate.orm.test.envers.entities.StrIntTestEntity; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildMultipleParentsEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildMultipleParentsEntity.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildMultipleParentsEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildMultipleParentsEntity.java index 9f6e49accd..f924d0187a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildMultipleParentsEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildMultipleParentsEntity.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.envers.test.integration.superclass.auditparents; +package org.hibernate.orm.test.envers.integration.superclass.auditparents; import javax.persistence.Entity; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.StrIntTestEntity; +import org.hibernate.orm.test.envers.entities.StrIntTestEntity; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildSingleParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildSingleParentEntity.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildSingleParentEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildSingleParentEntity.java index 828d85d2ba..a4749aa6f1 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildSingleParentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ChildSingleParentEntity.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.envers.test.integration.superclass.auditparents; +package org.hibernate.orm.test.envers.integration.superclass.auditparents; import javax.persistence.Entity; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.StrIntTestEntity; +import org.hibernate.orm.test.envers.entities.StrIntTestEntity; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ExplicitTransitiveChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ExplicitTransitiveChildEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ExplicitTransitiveChildEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ExplicitTransitiveChildEntity.java index 7c3af61182..d7fb3619d4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ExplicitTransitiveChildEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ExplicitTransitiveChildEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditparents; +package org.hibernate.orm.test.envers.integration.superclass.auditparents; import javax.persistence.Entity; import javax.persistence.Table; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ImplicitTransitiveChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ImplicitTransitiveChildEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ImplicitTransitiveChildEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ImplicitTransitiveChildEntity.java index 24d772f73f..032ba7d83d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ImplicitTransitiveChildEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/ImplicitTransitiveChildEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditparents; +package org.hibernate.orm.test.envers.integration.superclass.auditparents; import javax.persistence.Entity; import javax.persistence.Table; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/MappedGrandparentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedGrandparentEntity.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/MappedGrandparentEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedGrandparentEntity.java index cf751ee8c0..19852238f9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/MappedGrandparentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedGrandparentEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditparents; +package org.hibernate.orm.test.envers.integration.superclass.auditparents; import javax.persistence.Id; import javax.persistence.MappedSuperclass; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/MappedParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedParentEntity.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/MappedParentEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedParentEntity.java index b920badd7a..00a6d5f1bb 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/MappedParentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MappedParentEntity.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.envers.test.integration.superclass.auditparents; +package org.hibernate.orm.test.envers.integration.superclass.auditparents; import javax.persistence.ManyToOne; import javax.persistence.MappedSuperclass; -import org.hibernate.envers.test.entities.StrIntTestEntity; +import org.hibernate.orm.test.envers.entities.StrIntTestEntity; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/MultipleAuditParentsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MultipleAuditParentsTest.java similarity index 87% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/MultipleAuditParentsTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MultipleAuditParentsTest.java index 26646695ec..b22ce9c561 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/MultipleAuditParentsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/MultipleAuditParentsTest.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.envers.test.integration.superclass.auditparents; +package org.hibernate.orm.test.envers.integration.superclass.auditparents; import java.util.Set; import javax.persistence.EntityManager; import javax.persistence.MappedSuperclass; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrIntTestEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrIntTestEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; @@ -69,7 +69,7 @@ public class MultipleAuditParentsTest extends BaseEnversJPAFunctionalTestCase { Set unexpectedColumns = TestTools.makeSet( "notAudited" ); Table table = metadata().getEntityBinding( - "org.hibernate.envers.test.integration.superclass.auditparents.ChildMultipleParentsEntity_AUD" + "org.hibernate.orm.test.envers.integration.superclass.auditparents.ChildMultipleParentsEntity_AUD" ).getTable(); for ( String columnName : expectedColumns ) { diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/SingleAuditParentsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/SingleAuditParentsTest.java similarity index 87% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/SingleAuditParentsTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/SingleAuditParentsTest.java index e8e502f472..ef47fe8299 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/SingleAuditParentsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/SingleAuditParentsTest.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.envers.test.integration.superclass.auditparents; +package org.hibernate.orm.test.envers.integration.superclass.auditparents; import java.util.Set; import javax.persistence.EntityManager; import javax.persistence.MappedSuperclass; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrIntTestEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrIntTestEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; @@ -70,7 +70,7 @@ public class SingleAuditParentsTest extends BaseEnversJPAFunctionalTestCase { Set unexpectedColumns = TestTools.makeSet( "parent", "relation_id", "notAudited" ); Table table = metadata().getEntityBinding( - "org.hibernate.envers.test.integration.superclass.auditparents.ChildSingleParentEntity_AUD" + "org.hibernate.orm.test.envers.integration.superclass.auditparents.ChildSingleParentEntity_AUD" ).getTable(); for ( String columnName : expectedColumns ) { diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/TotalAuditParentsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TotalAuditParentsTest.java similarity index 87% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/TotalAuditParentsTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TotalAuditParentsTest.java index a7e2003436..84bb8cd08e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/TotalAuditParentsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TotalAuditParentsTest.java @@ -4,16 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditparents; +package org.hibernate.orm.test.envers.integration.superclass.auditparents; import java.util.Set; import javax.persistence.EntityManager; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrIntTestEntity; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrIntTestEntity; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; @@ -78,7 +78,7 @@ public class TotalAuditParentsTest extends BaseEnversJPAFunctionalTestCase { Set unexpectedColumns = TestTools.makeSet( "notAudited" ); Table table = metadata().getEntityBinding( - "org.hibernate.envers.test.integration.superclass.auditparents.BabyCompleteEntity_AUD" + "org.hibernate.orm.test.envers.integration.superclass.auditparents.BabyCompleteEntity_AUD" ).getTable(); for ( String columnName : expectedColumns ) { diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/TransitiveAuditParentsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveAuditParentsTest.java similarity index 88% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/TransitiveAuditParentsTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveAuditParentsTest.java index bfd8edf2c7..a24845dc53 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/TransitiveAuditParentsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveAuditParentsTest.java @@ -4,15 +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.envers.test.integration.superclass.auditparents; +package org.hibernate.orm.test.envers.integration.superclass.auditparents; import java.util.Set; import javax.persistence.EntityManager; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.tools.TestTools; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.tools.TestTools; import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; @@ -74,7 +74,7 @@ public class TransitiveAuditParentsTest extends BaseEnversJPAFunctionalTestCase @Test public void testCreatedAuditTables() { Table explicitTransChildTable = metadata().getEntityBinding( - "org.hibernate.envers.test.integration.superclass.auditparents.ExplicitTransitiveChildEntity_AUD" + "org.hibernate.orm.test.envers.integration.superclass.auditparents.ExplicitTransitiveChildEntity_AUD" ).getTable(); checkTableColumns( TestTools.makeSet( "child", "parent", "grandparent", "id" ), @@ -83,7 +83,7 @@ public class TransitiveAuditParentsTest extends BaseEnversJPAFunctionalTestCase ); Table implicitTransChildTable = metadata().getEntityBinding( - "org.hibernate.envers.test.integration.superclass.auditparents.ImplicitTransitiveChildEntity_AUD" + "org.hibernate.orm.test.envers.integration.superclass.auditparents.ImplicitTransitiveChildEntity_AUD" ).getTable(); checkTableColumns( TestTools.makeSet( "child", "parent", "grandparent", "id" ), diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/TransitiveParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveParentEntity.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/TransitiveParentEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveParentEntity.java index edf43cb40d..a91376cdea 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/TransitiveParentEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/superclass/auditparents/TransitiveParentEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.superclass.auditparents; +package org.hibernate.orm.test.envers.integration.superclass.auditparents; import javax.persistence.MappedSuperclass; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tools/OrderSequenceGenerationTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/OrderSequenceGenerationTest.java similarity index 92% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tools/OrderSequenceGenerationTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/OrderSequenceGenerationTest.java index 7ae397167d..585d02b55d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tools/OrderSequenceGenerationTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/OrderSequenceGenerationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.tools; +package org.hibernate.orm.test.envers.integration.tools; import java.io.File; import java.nio.file.Files; @@ -14,14 +14,12 @@ import javax.persistence.EntityManager; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.Oracle8iDialect; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.entities.StrTestEntity; -import org.hibernate.testing.BeforeClassOnce; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.TestForIssue; -import org.junit.Before; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tools/SchemaExportTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/SchemaExportTest.java similarity index 84% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tools/SchemaExportTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/SchemaExportTest.java index a4114822cc..59e4da60cc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tools/SchemaExportTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/SchemaExportTest.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.envers.test.integration.tools; +package org.hibernate.orm.test.envers.integration.tools; import java.util.Arrays; import org.hibernate.Session; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/update/SelectBeforeUpdateTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/update/SelectBeforeUpdateTest.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integration/update/SelectBeforeUpdateTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/update/SelectBeforeUpdateTest.java index 852209c99a..7069d1eb44 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/update/SelectBeforeUpdateTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/update/SelectBeforeUpdateTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.update; +package org.hibernate.orm.test.envers.integration.update; import javax.persistence.Entity; import javax.persistence.Id; @@ -13,8 +13,8 @@ import javax.persistence.ManyToOne; import org.hibernate.annotations.SelectBeforeUpdate; import org.hibernate.envers.Audited; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.Priority; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integrator/BasicIntegratorTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integrator/BasicIntegratorTest.java similarity index 95% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/integrator/BasicIntegratorTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integrator/BasicIntegratorTest.java index e4930b0c16..f8aa065adf 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integrator/BasicIntegratorTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integrator/BasicIntegratorTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integrator; +package org.hibernate.orm.test.envers.integrator; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AbstractEntityManagerTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AbstractEntityManagerTest.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AbstractEntityManagerTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AbstractEntityManagerTest.java index a29d9f7fc4..ea04d35cb5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AbstractEntityManagerTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AbstractEntityManagerTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.performance; +package org.hibernate.orm.test.envers.performance; import java.io.IOException; import java.util.Arrays; @@ -19,7 +19,7 @@ import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.boot.internal.EnversIntegrator; -import org.hibernate.envers.test.AbstractEnversTest; +import org.hibernate.orm.test.envers.AbstractEnversTest; import org.hibernate.jpa.AvailableSettings; import org.hibernate.jpa.HibernateEntityManagerFactory; import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AbstractPerformanceTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AbstractPerformanceTest.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AbstractPerformanceTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AbstractPerformanceTest.java index b258528f67..52c96b6b15 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AbstractPerformanceTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AbstractPerformanceTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.performance; +package org.hibernate.orm.test.envers.performance; import java.io.IOException; import java.util.ArrayList; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AllPerformance.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AllPerformance.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AllPerformance.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AllPerformance.java index 5168158087..85ebb6be82 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AllPerformance.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/AllPerformance.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.performance; +package org.hibernate.orm.test.envers.performance; import java.io.IOException; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/ComplexInsertPerformance.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/ComplexInsertPerformance.java similarity index 89% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/performance/ComplexInsertPerformance.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/ComplexInsertPerformance.java index 6041891fa9..8ea2aa478c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/ComplexInsertPerformance.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/ComplexInsertPerformance.java @@ -5,16 +5,16 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.performance; +package org.hibernate.orm.test.envers.performance; import java.io.IOException; import java.util.Date; import java.util.HashSet; import javax.persistence.EntityManager; -import org.hibernate.envers.test.performance.complex.ChildEntity1; -import org.hibernate.envers.test.performance.complex.ChildEntity2; -import org.hibernate.envers.test.performance.complex.RootEntity; +import org.hibernate.orm.test.envers.performance.complex.ChildEntity1; +import org.hibernate.orm.test.envers.performance.complex.ChildEntity2; +import org.hibernate.orm.test.envers.performance.complex.RootEntity; import org.junit.Ignore; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/EvictAuditDataAfterCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/EvictAuditDataAfterCommitTest.java similarity index 87% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/performance/EvictAuditDataAfterCommitTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/EvictAuditDataAfterCommitTest.java index 2214ff2c7d..83b951ecad 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/EvictAuditDataAfterCommitTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/EvictAuditDataAfterCommitTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.performance; +package org.hibernate.orm.test.envers.performance; import java.util.Arrays; import java.util.HashSet; @@ -17,10 +17,10 @@ import org.hibernate.engine.spi.EntityEntry; import org.hibernate.engine.spi.PersistenceContext; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; -import org.hibernate.envers.test.BaseEnversFunctionalTestCase; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.onetomany.SetRefEdEntity; -import org.hibernate.envers.test.entities.onetomany.SetRefIngEntity; +import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; +import org.hibernate.orm.test.envers.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.onetomany.SetRefEdEntity; +import org.hibernate.orm.test.envers.entities.onetomany.SetRefIngEntity; import org.hibernate.testing.TestForIssue; import org.junit.Assert; @@ -43,15 +43,15 @@ public class EvictAuditDataAfterCommitTest extends BaseEnversFunctionalTestCase StrTestEntity ste = new StrTestEntity( "data" ); session.persist( ste ); session.getTransaction().commit(); - checkEmptyAuditSessionCache( session, "org.hibernate.envers.test.entities.StrTestEntity_AUD" ); + checkEmptyAuditSessionCache( session, "org.hibernate.orm.test.envers.entities.StrTestEntity_AUD" ); } @Test @TestForIssue(jiraKey = "HHH-6614") public void testSessionCacheCollectionClear() { final String[] auditEntityNames = new String[] { - "org.hibernate.envers.test.entities.onetomany.SetRefEdEntity_AUD", - "org.hibernate.envers.test.entities.onetomany.SetRefIngEntity_AUD" + "org.hibernate.orm.test.envers.entities.onetomany.SetRefEdEntity_AUD", + "org.hibernate.orm.test.envers.entities.onetomany.SetRefIngEntity_AUD" }; SetRefEdEntity ed1 = new SetRefEdEntity( 1, "data_ed_1" ); diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/InsertsOneTransactionPerformance.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsOneTransactionPerformance.java similarity index 91% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/performance/InsertsOneTransactionPerformance.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsOneTransactionPerformance.java index b0dc653126..f1d2d59999 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/InsertsOneTransactionPerformance.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsOneTransactionPerformance.java @@ -5,12 +5,12 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.performance; +package org.hibernate.orm.test.envers.performance; import java.io.IOException; import javax.persistence.EntityManager; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.junit.Ignore; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/InsertsPerformance.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsPerformance.java similarity index 90% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/performance/InsertsPerformance.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsPerformance.java index 3cafbced12..d06ddd3a23 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/InsertsPerformance.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/InsertsPerformance.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.envers.test.performance; +package org.hibernate.orm.test.envers.performance; import java.io.IOException; import javax.persistence.EntityManager; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.junit.Ignore; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/UpdatesPerformance.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/UpdatesPerformance.java similarity index 94% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/performance/UpdatesPerformance.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/UpdatesPerformance.java index fb5040c13b..7f517f6a98 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/UpdatesPerformance.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/UpdatesPerformance.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.performance; +package org.hibernate.orm.test.envers.performance; import java.io.IOException; import java.util.ArrayList; @@ -12,7 +12,7 @@ import java.util.List; import java.util.Random; import javax.persistence.EntityManager; -import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.orm.test.envers.entities.StrTestEntity; import org.junit.Ignore; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/complex/ChildEntity1.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity1.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/performance/complex/ChildEntity1.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity1.java index 0211a90641..5ad874795f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/complex/ChildEntity1.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity1.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.performance.complex; +package org.hibernate.orm.test.envers.performance.complex; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/complex/ChildEntity2.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity2.java similarity index 96% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/performance/complex/ChildEntity2.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity2.java index e4e6525220..b27a765d9b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/complex/ChildEntity2.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/ChildEntity2.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.performance.complex; +package org.hibernate.orm.test.envers.performance.complex; import java.util.Set; import javax.persistence.ElementCollection; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/complex/RootEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/RootEntity.java similarity index 98% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/performance/complex/RootEntity.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/RootEntity.java index 906494e42a..cb6dd887ea 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/complex/RootEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/complex/RootEntity.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.performance.complex; +package org.hibernate.orm.test.envers.performance.complex; import java.util.Date; import javax.persistence.CascadeType; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/tools/TablePrinter.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TablePrinter.java similarity index 98% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/tools/TablePrinter.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TablePrinter.java index 22d526595f..22b98652c7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/tools/TablePrinter.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TablePrinter.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.tools; +package org.hibernate.orm.test.envers.tools; import java.util.List; import java.util.Map; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/tools/TestTools.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TestTools.java similarity index 98% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/tools/TestTools.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TestTools.java index d6dd0c4f7b..4445e45e4a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/tools/TestTools.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/tools/TestTools.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.tools; +package org.hibernate.orm.test.envers.tools; import java.util.ArrayList; import java.util.Arrays; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/various/Address.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Address.java similarity index 98% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/various/Address.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Address.java index bd8552aba8..5933a29a9c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/various/Address.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Address.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.various; +package org.hibernate.orm.test.envers.various; import java.util.Set; import javax.persistence.Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/various/ExportIdentifierTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/ExportIdentifierTest.java similarity index 98% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/various/ExportIdentifierTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/ExportIdentifierTest.java index b71732ad3a..fed16cbb54 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/various/ExportIdentifierTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/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.envers.test.various; +package org.hibernate.orm.test.envers.various; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/various/HsqlTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/HsqlTest.java similarity index 98% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/various/HsqlTest.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/HsqlTest.java index 26f1a54626..f5206d5bb3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/various/HsqlTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/HsqlTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.various; +package org.hibernate.orm.test.envers.various; import java.util.HashMap; import java.util.HashSet; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/various/Person.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Person.java similarity index 97% rename from hibernate-envers/src/test/java/org/hibernate/envers/test/various/Person.java rename to hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/Person.java index 457f90c216..eda34e79e3 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/various/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/various/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.envers.test.various; +package org.hibernate.orm.test.envers.various; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-envers/src/test/resources/mappings/collections/Category.hbm.xml b/hibernate-envers/src/test/resources/mappings/collections/Category.hbm.xml index 0746c4e63c..00d174ce24 100644 --- a/hibernate-envers/src/test/resources/mappings/collections/Category.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/collections/Category.hbm.xml @@ -7,7 +7,7 @@ --> - + category_id_seq @@ -19,14 +19,14 @@ - + - - + + diff --git a/hibernate-envers/src/test/resources/mappings/collections/Item.hbm.xml b/hibernate-envers/src/test/resources/mappings/collections/Item.hbm.xml index 53975b4008..c49a60e13e 100644 --- a/hibernate-envers/src/test/resources/mappings/collections/Item.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/collections/Item.hbm.xml @@ -7,7 +7,7 @@ --> - + item_id_seq diff --git a/hibernate-envers/src/test/resources/mappings/components/UniquePropsEntity.hbm.xml b/hibernate-envers/src/test/resources/mappings/components/UniquePropsEntity.hbm.xml index ab4d255811..4028c2efbd 100644 --- a/hibernate-envers/src/test/resources/mappings/components/UniquePropsEntity.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/components/UniquePropsEntity.hbm.xml @@ -7,7 +7,7 @@ --> - + diff --git a/hibernate-envers/src/test/resources/mappings/components/UniquePropsNotAuditedEntity.hbm.xml b/hibernate-envers/src/test/resources/mappings/components/UniquePropsNotAuditedEntity.hbm.xml index 1b2076586e..b3ca1c199d 100644 --- a/hibernate-envers/src/test/resources/mappings/components/UniquePropsNotAuditedEntity.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/components/UniquePropsNotAuditedEntity.hbm.xml @@ -7,7 +7,7 @@ --> - + diff --git a/hibernate-envers/src/test/resources/mappings/customType/mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/customType/mappings.hbm.xml index c04f81f6a7..abc0224eeb 100644 --- a/hibernate-envers/src/test/resources/mappings/customType/mappings.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/customType/mappings.hbm.xml @@ -7,7 +7,7 @@ --> - + @@ -15,14 +15,14 @@ - org.hibernate.envers.test.entities.customtype.UnspecifiedEnumTypeEntity$E1 + org.hibernate.orm.test.envers.entities.customtype.UnspecifiedEnumTypeEntity$E1 - org.hibernate.envers.test.entities.customtype.UnspecifiedEnumTypeEntity$E2 + org.hibernate.orm.test.envers.entities.customtype.UnspecifiedEnumTypeEntity$E2 diff --git a/hibernate-envers/src/test/resources/mappings/dynamicComponents/mapAdvanced.hbm.xml b/hibernate-envers/src/test/resources/mappings/dynamicComponents/mapAdvanced.hbm.xml index 901d40ba37..6d140f0b02 100644 --- a/hibernate-envers/src/test/resources/mappings/dynamicComponents/mapAdvanced.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/dynamicComponents/mapAdvanced.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + @@ -17,12 +17,12 @@ + class="org.hibernate.orm.test.envers.integration.components.dynamic.OneToOneEntity"/> + class="org.hibernate.orm.test.envers.integration.components.dynamic.InternalComponent"> @@ -41,34 +41,34 @@ - + - - + - + - + - + - + - + diff --git a/hibernate-envers/src/test/resources/mappings/dynamicComponents/mapAudited.hbm.xml b/hibernate-envers/src/test/resources/mappings/dynamicComponents/mapAudited.hbm.xml index b33c0f25b9..56ca359529 100644 --- a/hibernate-envers/src/test/resources/mappings/dynamicComponents/mapAudited.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/dynamicComponents/mapAudited.hbm.xml @@ -9,17 +9,17 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + - + - + diff --git a/hibernate-envers/src/test/resources/mappings/dynamicComponents/mapNotAudited.hbm.xml b/hibernate-envers/src/test/resources/mappings/dynamicComponents/mapNotAudited.hbm.xml index 771977bd76..9b11599850 100644 --- a/hibernate-envers/src/test/resources/mappings/dynamicComponents/mapNotAudited.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/dynamicComponents/mapNotAudited.hbm.xml @@ -10,7 +10,7 @@ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-envers/src/test/resources/mappings/dynamicComponents/mapSanityCheck.hbm.xml b/hibernate-envers/src/test/resources/mappings/dynamicComponents/mapSanityCheck.hbm.xml index 685e6ff043..4a4e20a6fe 100644 --- a/hibernate-envers/src/test/resources/mappings/dynamicComponents/mapSanityCheck.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/dynamicComponents/mapSanityCheck.hbm.xml @@ -10,45 +10,45 @@ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + - + + class="org.hibernate.orm.test.envers.integration.components.dynamic.OneToOneEntity"/> - + class="org.hibernate.orm.test.envers.integration.components.dynamic.InternalComponent"> - + - + - + - + diff --git a/hibernate-envers/src/test/resources/mappings/entityNames/auditedEntity/mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/entityNames/auditedEntity/mappings.hbm.xml index 1e0839a0f6..432dd862b6 100644 --- a/hibernate-envers/src/test/resources/mappings/entityNames/auditedEntity/mappings.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/entityNames/auditedEntity/mappings.hbm.xml @@ -8,7 +8,7 @@ - + diff --git a/hibernate-envers/src/test/resources/mappings/entityNames/manyToManyAudited/mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/entityNames/manyToManyAudited/mappings.hbm.xml index 174ee2a7ec..7052477f48 100644 --- a/hibernate-envers/src/test/resources/mappings/entityNames/manyToManyAudited/mappings.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/entityNames/manyToManyAudited/mappings.hbm.xml @@ -8,7 +8,7 @@ - @@ -23,12 +23,12 @@ + class="org.hibernate.orm.test.envers.integration.entityNames.manyToManyAudited.Car" column="ID_PERSON"/> - + diff --git a/hibernate-envers/src/test/resources/mappings/entityNames/oneToManyAudited/mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/entityNames/oneToManyAudited/mappings.hbm.xml index 5e307627d0..d16205bbc3 100644 --- a/hibernate-envers/src/test/resources/mappings/entityNames/oneToManyAudited/mappings.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/entityNames/oneToManyAudited/mappings.hbm.xml @@ -8,7 +8,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/hibernate-envers/src/test/resources/mappings/entityNames/oneToManyNotAudited/mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/entityNames/oneToManyNotAudited/mappings.hbm.xml index 996053e5d2..755dade2fb 100644 --- a/hibernate-envers/src/test/resources/mappings/entityNames/oneToManyNotAudited/mappings.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/entityNames/oneToManyNotAudited/mappings.hbm.xml @@ -8,7 +8,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/hibernate-envers/src/test/resources/mappings/entityNames/singleAssociatedAudited/mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/entityNames/singleAssociatedAudited/mappings.hbm.xml index 6a7f5924f2..0b4262f009 100644 --- a/hibernate-envers/src/test/resources/mappings/entityNames/singleAssociatedAudited/mappings.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/entityNames/singleAssociatedAudited/mappings.hbm.xml @@ -8,7 +8,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -35,7 +35,7 @@ - + diff --git a/hibernate-envers/src/test/resources/mappings/entityNames/singleAssociatedNotAudited/mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/entityNames/singleAssociatedNotAudited/mappings.hbm.xml index a7ae730762..78b47e8a01 100644 --- a/hibernate-envers/src/test/resources/mappings/entityNames/singleAssociatedNotAudited/mappings.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/entityNames/singleAssociatedNotAudited/mappings.hbm.xml @@ -8,7 +8,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/hibernate-envers/src/test/resources/mappings/interfaces/joinedAllAuditedMappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/interfaces/joinedAllAuditedMappings.hbm.xml index 20dbfac304..cfd1021c43 100644 --- a/hibernate-envers/src/test/resources/mappings/interfaces/joinedAllAuditedMappings.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/interfaces/joinedAllAuditedMappings.hbm.xml @@ -9,7 +9,7 @@ @@ -21,8 +21,8 @@ @@ -32,8 +32,8 @@ diff --git a/hibernate-envers/src/test/resources/mappings/interfaces/joinedPropertiesAudited2Mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/interfaces/joinedPropertiesAudited2Mappings.hbm.xml index bd310945fa..71f79d51d4 100644 --- a/hibernate-envers/src/test/resources/mappings/interfaces/joinedPropertiesAudited2Mappings.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/interfaces/joinedPropertiesAudited2Mappings.hbm.xml @@ -9,7 +9,7 @@ @@ -21,8 +21,8 @@ @@ -34,8 +34,8 @@ diff --git a/hibernate-envers/src/test/resources/mappings/interfaces/joinedPropertiesAuditedMappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/interfaces/joinedPropertiesAuditedMappings.hbm.xml index 83110f3815..446fe9291b 100644 --- a/hibernate-envers/src/test/resources/mappings/interfaces/joinedPropertiesAuditedMappings.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/interfaces/joinedPropertiesAuditedMappings.hbm.xml @@ -9,7 +9,7 @@ @@ -23,8 +23,8 @@ @@ -34,8 +34,8 @@ diff --git a/hibernate-envers/src/test/resources/mappings/interfaces/subclassAllAuditedMappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/interfaces/subclassAllAuditedMappings.hbm.xml index a0401e6479..ed4fe79f32 100644 --- a/hibernate-envers/src/test/resources/mappings/interfaces/subclassAllAuditedMappings.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/interfaces/subclassAllAuditedMappings.hbm.xml @@ -9,7 +9,7 @@ @@ -23,8 +23,8 @@ @@ -32,8 +32,8 @@ diff --git a/hibernate-envers/src/test/resources/mappings/interfaces/subclassPropertiesAudited2Mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/interfaces/subclassPropertiesAudited2Mappings.hbm.xml index 156931ab89..24e12dc144 100644 --- a/hibernate-envers/src/test/resources/mappings/interfaces/subclassPropertiesAudited2Mappings.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/interfaces/subclassPropertiesAudited2Mappings.hbm.xml @@ -9,7 +9,7 @@ @@ -23,8 +23,8 @@ @@ -34,8 +34,8 @@ diff --git a/hibernate-envers/src/test/resources/mappings/interfaces/subclassPropertiesAuditedMappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/interfaces/subclassPropertiesAuditedMappings.hbm.xml index d8647001c6..f6925e3920 100644 --- a/hibernate-envers/src/test/resources/mappings/interfaces/subclassPropertiesAuditedMappings.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/interfaces/subclassPropertiesAuditedMappings.hbm.xml @@ -9,7 +9,7 @@ @@ -25,8 +25,8 @@ @@ -34,8 +34,8 @@ diff --git a/hibernate-envers/src/test/resources/mappings/interfaces/unionAllAuditedMappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/interfaces/unionAllAuditedMappings.hbm.xml index a567cbacfc..7f7463a511 100644 --- a/hibernate-envers/src/test/resources/mappings/interfaces/unionAllAuditedMappings.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/interfaces/unionAllAuditedMappings.hbm.xml @@ -9,7 +9,7 @@ @@ -21,8 +21,8 @@ @@ -30,8 +30,8 @@ diff --git a/hibernate-envers/src/test/resources/mappings/interfaces/unionPropertiesAudited2Mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/interfaces/unionPropertiesAudited2Mappings.hbm.xml index 23f4da9bc0..4b1d8691c9 100644 --- a/hibernate-envers/src/test/resources/mappings/interfaces/unionPropertiesAudited2Mappings.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/interfaces/unionPropertiesAudited2Mappings.hbm.xml @@ -9,7 +9,7 @@ @@ -21,8 +21,8 @@ @@ -32,8 +32,8 @@ diff --git a/hibernate-envers/src/test/resources/mappings/interfaces/unionPropertiesAuditedMappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/interfaces/unionPropertiesAuditedMappings.hbm.xml index bc46b949b6..4fd1fdbba5 100644 --- a/hibernate-envers/src/test/resources/mappings/interfaces/unionPropertiesAuditedMappings.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/interfaces/unionPropertiesAuditedMappings.hbm.xml @@ -9,7 +9,7 @@ @@ -23,8 +23,8 @@ @@ -32,8 +32,8 @@ diff --git a/hibernate-envers/src/test/resources/mappings/manyToMany/inverseToSuperclass/mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/manyToMany/inverseToSuperclass/mappings.hbm.xml index d6099c6d47..23df10de96 100644 --- a/hibernate-envers/src/test/resources/mappings/manyToMany/inverseToSuperclass/mappings.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/manyToMany/inverseToSuperclass/mappings.hbm.xml @@ -9,7 +9,7 @@ @@ -22,14 +22,14 @@ table="HIB_ROOT_DETAIL"> @@ -39,19 +39,19 @@ + extends="org.hibernate.orm.test.envers.integration.manytomany.inverseToSuperclass.DetailSubclass"> diff --git a/hibernate-envers/src/test/resources/mappings/oneToMany/inverseToSuperclass/mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/oneToMany/inverseToSuperclass/mappings.hbm.xml index 742a4027d2..76b2d419d6 100644 --- a/hibernate-envers/src/test/resources/mappings/oneToMany/inverseToSuperclass/mappings.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/oneToMany/inverseToSuperclass/mappings.hbm.xml @@ -9,7 +9,7 @@ @@ -22,13 +22,13 @@ inverse="true"> + class="org.hibernate.orm.test.envers.integration.onetomany.inverseToSuperclass.DetailSubclass2" /> @@ -36,16 +36,16 @@ + class="org.hibernate.orm.test.envers.integration.onetomany.inverseToSuperclass.Root" /> + name="org.hibernate.orm.test.envers.integration.onetomany.inverseToSuperclass.DetailSubclass2" + discriminator-value="SUB2" extends="org.hibernate.orm.test.envers.integration.onetomany.inverseToSuperclass.DetailSubclass"> diff --git a/hibernate-envers/src/test/resources/mappings/oneToOne/bidirectional/eagerLoading.hbm.xml b/hibernate-envers/src/test/resources/mappings/oneToOne/bidirectional/eagerLoading.hbm.xml index 56788d9fd4..cf36c2cfdf 100644 --- a/hibernate-envers/src/test/resources/mappings/oneToOne/bidirectional/eagerLoading.hbm.xml +++ b/hibernate-envers/src/test/resources/mappings/oneToOne/bidirectional/eagerLoading.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-envers/src/test_legacy/org/hibernate/envers/test/integration/basic/ClassicQueryTranslatorFactoryTest.java b/hibernate-envers/src/test_legacy/org/hibernate/envers/test/integration/basic/ClassicQueryTranslatorFactoryTest.java index 6f74f3844d..d2a3bc8708 100644 --- a/hibernate-envers/src/test_legacy/org/hibernate/envers/test/integration/basic/ClassicQueryTranslatorFactoryTest.java +++ b/hibernate-envers/src/test_legacy/org/hibernate/envers/test/integration/basic/ClassicQueryTranslatorFactoryTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.envers.test.integration.basic; +package org.hibernate.orm.test.envers.integration.basic; import java.util.Map;