From 88953478675373e1356183bc1f420904264c036e Mon Sep 17 00:00:00 2001
From: Andrea Boriero <andrea@hibernate.org>
Date: Mon, 28 Jun 2021 15:07:11 +0200
Subject: [PATCH] Fix null dicriminator unable to cast MarkerObject to ...

---
 .../envers/QueryAuditAdressCountryTest.java   |   6 +-
 etc/hibernate.cfg.xml                         |   2 +-
 .../cache/SQLFunctionsInterSystemsTest.java   |  10 +-
 .../entity/SingleTableEntityPersister.java    |  17 +-
 .../hibernate/{ => orm}/test/legacy/A.java    |   2 +-
 .../{ => orm}/test/legacy/ABC.hbm.xml         |  10 +-
 .../{ => orm}/test/legacy/ABCExtends.hbm.xml  |   2 +-
 .../{ => orm}/test/legacy/ABCProxy.hbm.xml    |  26 +--
 .../hibernate/orm/test/legacy/ABCTest.java    | 185 ++++++++++++++++
 .../{ => orm}/test/legacy/Abstract.java       |   3 +-
 .../{ => orm}/test/legacy/AbstractProxy.java  |  11 +-
 .../{ => orm}/test/legacy/AltSimple.hbm.xml   |   2 +-
 .../{ => orm}/test/legacy/Assignable.java     |   3 +-
 .../hibernate/{ => orm}/test/legacy/B.java    |   2 +-
 .../hibernate/{ => orm}/test/legacy/Bar.java  |   3 +-
 .../{ => orm}/test/legacy/BarProxy.java       |  16 +-
 .../{ => orm}/test/legacy/BasicNameable.java  |   2 +-
 .../{ => orm}/test/legacy/Baz.hbm.xml         |  70 +++----
 .../hibernate/{ => orm}/test/legacy/Baz.java  |   3 +-
 .../{ => orm}/test/legacy/Blobber.hbm.xml     |   2 +-
 .../{ => orm}/test/legacy/Blobber.java        |   3 +-
 .../{ => orm}/test/legacy/Broken.hbm.xml      |   6 +-
 .../{ => orm}/test/legacy/Broken.java         |   3 +-
 .../hibernate/{ => orm}/test/legacy/C1.java   |   3 +-
 .../hibernate/{ => orm}/test/legacy/C2.java   |   3 +-
 .../{ => orm}/test/legacy/Category.hbm.xml    |  14 +-
 .../{ => orm}/test/legacy/Category.java       |   3 +-
 .../{ => orm}/test/legacy/Child.java          |   2 +-
 .../{ => orm}/test/legacy/Circular.hbm.xml    |   2 +-
 .../{ => orm}/test/legacy/Circular.java       |  25 ++-
 .../{ => orm}/test/legacy/Commento.hbm.xml    |   0
 .../{ => orm}/test/legacy/Company.java        |   4 +-
 .../{ => orm}/test/legacy/Component.java      |   2 +-
 .../test/legacy/ComponentCollection.java      |   3 +-
 .../test/legacy/ComponentNotNull.java         |   2 +-
 .../test/legacy/ComponentNotNullRoot.hbm.xml  |   8 +-
 .../test/legacy/ComponentNotNullRoot.java     |   2 +-
 .../test/legacy/Componentizable.hbm.xml       |   8 +-
 .../test/legacy/Componentizable.java          |   2 +-
 .../test/legacy/CompositeElement.java         |   3 +-
 .../test/legacy/CompositeIdId.hbm.xml         |   2 +-
 .../{ => orm}/test/legacy/CompositeIdId.java  |   3 +-
 .../{ => orm}/test/legacy/Contained.java      |   3 +-
 .../{ => orm}/test/legacy/Container.hbm.xml   |  30 +--
 .../{ => orm}/test/legacy/Container.java      |   3 +-
 .../{ => orm}/test/legacy/Custom.hbm.xml      |   2 +-
 .../{ => orm}/test/legacy/Custom.java         |   4 +-
 .../test/legacy/CustomPersister.java          |   3 +-
 .../{ => orm}/test/legacy/CustomSQL.hbm.xml   |   4 +-
 .../hibernate/{ => orm}/test/legacy/D.java    |   2 +-
 .../{ => orm}/test/legacy/Detail.java         |   3 +-
 .../hibernate/{ => orm}/test/legacy/Down.java |   4 +-
 .../hibernate/{ => orm}/test/legacy/Drug.java |   5 +-
 .../hibernate/{ => orm}/test/legacy/E.java    |   3 +-
 .../{ => orm}/test/legacy/Eye.hbm.xml         |   2 +-
 .../hibernate/{ => orm}/test/legacy/Eye.java  |   3 +-
 .../{ => orm}/test/legacy/Fee.hbm.xml         |   2 +-
 .../hibernate/{ => orm}/test/legacy/Fee.java  |   3 +-
 .../{ => orm}/test/legacy/Fixed.java          |   3 +-
 .../{ => orm}/test/legacy/Fo.hbm.xml          |   4 +-
 .../hibernate/{ => orm}/test/legacy/Fo.java   |   2 +-
 .../hibernate/{ => orm}/test/legacy/Foo.java  |   2 +-
 .../{ => orm}/test/legacy/FooBar.hbm.xml      |   8 +-
 .../{ => orm}/test/legacy/FooComponent.java   |   2 +-
 .../{ => orm}/test/legacy/FooProxy.java       |   2 +-
 .../{ => orm}/test/legacy/Fum.hbm.xml         |   8 +-
 .../hibernate/{ => orm}/test/legacy/Fum.java  |   2 +-
 .../{ => orm}/test/legacy/FumCompositeID.java |   2 +-
 .../{ => orm}/test/legacy/Fumm.hbm.xml        |   2 +-
 .../hibernate/{ => orm}/test/legacy/Fumm.java |   2 +-
 .../{ => orm}/test/legacy/Glarch.hbm.xml      |   4 +-
 .../{ => orm}/test/legacy/Glarch.java         |   2 +-
 .../{ => orm}/test/legacy/GlarchProxy.java    |   2 +-
 .../{ => orm}/test/legacy/Holder.hbm.xml      |   8 +-
 .../{ => orm}/test/legacy/Holder.java         |   2 +-
 .../hibernate/{ => orm}/test/legacy/I.java    |   2 +-
 .../{ => orm}/test/legacy/IJ.hbm.xml          |   2 +-
 .../{ => orm}/test/legacy/IJ2.hbm.xml         |   2 +-
 .../{ => orm}/test/legacy/Immutable.hbm.xml   |   2 +-
 .../{ => orm}/test/legacy/Immutable.java      |   2 +-
 .../{ => orm}/test/legacy/Inner.java          |   2 +-
 .../{ => orm}/test/legacy/InnerKey.java       |   2 +-
 .../{ => orm}/test/legacy/Intervention.java   |   2 +-
 .../hibernate/{ => orm}/test/legacy/J.java    |   2 +-
 .../hibernate/{ => orm}/test/legacy/Jay.java  |   2 +-
 .../hibernate/{ => orm}/test/legacy/K.java    |   2 +-
 .../{ => orm}/test/legacy/Location.hbm.xml    |   2 +-
 .../{ => orm}/test/legacy/Location.java       |   2 +-
 .../{ => orm}/test/legacy/Lower.java          |   2 +-
 .../{ => orm}/test/legacy/MainObject.hbm.xml  |   4 +-
 .../{ => orm}/test/legacy/MainObject.java     |   2 +-
 .../{ => orm}/test/legacy/Many.hbm.xml        |   4 +-
 .../hibernate/{ => orm}/test/legacy/Many.java |   2 +-
 .../{ => orm}/test/legacy/Map.hbm.xml         |   0
 .../{ => orm}/test/legacy/Marelo.hbm.xml      |   0
 .../{ => orm}/test/legacy/Medication.java     |  10 +-
 .../{ => orm}/test/legacy/Middle.hbm.xml      |   8 +-
 .../{ => orm}/test/legacy/Middle.java         |   2 +-
 .../{ => orm}/test/legacy/MiddleKey.java      |   2 +-
 .../hibernate/{ => orm}/test/legacy/Mono.java |   2 +-
 .../{ => orm}/test/legacy/MoreStuff.java      |   2 +-
 .../{ => orm}/test/legacy/Multi.hbm.xml       |  34 +--
 .../{ => orm}/test/legacy/Multi.java          |   2 +-
 .../test/legacy/MultiExtends.hbm.xml          |   4 +-
 .../{ => orm}/test/legacy/Multiplicity.java   |   2 +-
 .../{ => orm}/test/legacy/Nameable.hbm.xml    |   4 +-
 .../{ => orm}/test/legacy/Nameable.java       |   2 +-
 .../{ => orm}/test/legacy/Named.java          |   2 +-
 .../test/legacy/NestingComponent.java         |   2 +-
 .../test/legacy/NonReflectiveBinderTest.java  | 197 +++++++++---------
 .../{ => orm}/test/legacy/Object2.hbm.xml     |   4 +-
 .../{ => orm}/test/legacy/Object2.java        |   2 +-
 .../{ => orm}/test/legacy/One.hbm.xml         |   4 +-
 .../hibernate/{ => orm}/test/legacy/One.java  |   2 +-
 .../{ => orm}/test/legacy/Outer.java          |   2 +-
 .../{ => orm}/test/legacy/OuterKey.java       |   2 +-
 .../{ => orm}/test/legacy/Parent.java         |   2 +-
 .../{ => orm}/test/legacy/ParentChild.hbm.xml |   6 +-
 .../hibernate/{ => orm}/test/legacy/Part.java |   2 +-
 .../{ => orm}/test/legacy/Party.java          |   2 +-
 .../{ => orm}/test/legacy/Person.java         |   4 +-
 .../hibernate/{ => orm}/test/legacy/Po.java   |   2 +-
 .../{ => orm}/test/legacy/Qux.hbm.xml         |   8 +-
 .../hibernate/{ => orm}/test/legacy/Qux.java  |   3 +-
 .../{ => orm}/test/legacy/Resource.java       |   2 +-
 .../{ => orm}/test/legacy/Result.java         |   2 +-
 .../test/legacy/ReverseComparator.java        |   2 +-
 .../hibernate/{ => orm}/test/legacy/Role.java |   2 +-
 .../hibernate/{ => orm}/test/legacy/Root.java |   2 +-
 .../{ => orm}/test/legacy/RootDetail.hbm.xml  |  16 +-
 .../hibernate/{ => orm}/test/legacy/S.java    |   2 +-
 .../{ => orm}/test/legacy/Several.java        |   2 +-
 .../{ => orm}/test/legacy/Simple.hbm.xml      |   2 +-
 .../{ => orm}/test/legacy/Simple.java         |   2 +-
 .../{ => orm}/test/legacy/Single.java         |   2 +-
 .../test/legacy/SingleSeveral.hbm.xml         |   6 +-
 .../{ => orm}/test/legacy/Sortable.java       |   2 +-
 .../test/legacy/StringComparator.java         |   2 +-
 .../{ => orm}/test/legacy/Stuff.hbm.xml       |  10 +-
 .../{ => orm}/test/legacy/Stuff.java          |   2 +-
 .../{ => orm}/test/legacy/SubComponent.java   |   2 +-
 .../{ => orm}/test/legacy/SubDetail.java      |   2 +-
 .../{ => orm}/test/legacy/SubMulti.java       |   2 +-
 .../{ => orm}/test/legacy/Super.java          |   2 +-
 .../hibernate/{ => orm}/test/legacy/Top.java  |   2 +-
 .../{ => orm}/test/legacy/Trivial.java        |   2 +-
 .../{ => orm}/test/legacy/TrivialClass.java   |   2 +-
 .../{ => orm}/test/legacy/TrivialProxy.java   |   2 +-
 .../hibernate/{ => orm}/test/legacy/Up.java   |   2 +-
 .../{ => orm}/test/legacy/UpDown.hbm.xml      |   4 +-
 .../{ => orm}/test/legacy/Vetoer.hbm.xml      |   2 +-
 .../{ => orm}/test/legacy/Vetoer.java         |   3 +-
 .../hibernate/{ => orm}/test/legacy/W.java    |   2 +-
 .../{ => orm}/test/legacy/WZ.hbm.xml          |   8 +-
 .../{ => orm}/test/legacy/Wicked.hbm.xml      |  14 +-
 .../hibernate/{ => orm}/test/legacy/X.java    |   2 +-
 .../{ => orm}/test/legacy/XY.hbm.xml          |   8 +-
 .../hibernate/{ => orm}/test/legacy/Y.java    |   2 +-
 .../hibernate/{ => orm}/test/legacy/Z.java    |   2 +-
 .../NumericValidationTest.java                |   2 +-
 .../org/hibernate/test/hql/FooBarCopy.hbm.xml |   4 +-
 .../org/hibernate/test/legacy/ABCTest.java    | 171 ---------------
 .../src/test/resources/hibernate.cfg.xml      |   2 +-
 .../hibernate/test/legacy/ABCProxyTest.java   |   2 +-
 .../test/legacy/ComponentNotNullTest.java     |   2 +-
 .../hibernate/test/legacy/CustomSQLTest.java  |   2 +-
 .../org/hibernate/test/legacy/FooBarTest.java |   2 +-
 .../org/hibernate/test/legacy/FumTest.java    |   2 +-
 .../org/hibernate/test/legacy/IJ2Test.java    |   2 +-
 .../org/hibernate/test/legacy/IJTest.java     |   2 +-
 .../hibernate/test/legacy/LegacyTestCase.java |   2 +-
 .../org/hibernate/test/legacy/MapTest.java    |   2 +-
 .../hibernate/test/legacy/MultiTableTest.java |   2 +-
 .../test/legacy/OneToOneCacheTest.java        |   2 +-
 .../test/legacy/ParentChildTest.java          |   2 +-
 .../test/legacy/QueryByExampleTest.java       |   2 +-
 .../hibernate/test/legacy/RootDetailTest.java |   2 +-
 .../test/legacy/SQLFunctionsTest.java         |   2 +-
 .../hibernate/test/legacy/SQLLoaderTest.java  |   2 +-
 .../hibernate/test/legacy/StatisticsTest.java |   2 +-
 180 files changed, 665 insertions(+), 644 deletions(-)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/A.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/ABC.hbm.xml (82%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/ABCExtends.hbm.xml (82%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/ABCProxy.hbm.xml (59%)
 create mode 100644 hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABCTest.java
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Abstract.java (94%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/AbstractProxy.java (60%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/AltSimple.hbm.xml (92%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Assignable.java (93%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/B.java (94%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Bar.java (97%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/BarProxy.java (59%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/BasicNameable.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Baz.hbm.xml (75%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Baz.java (99%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Blobber.hbm.xml (89%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Blobber.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Broken.hbm.xml (83%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Broken.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/C1.java (97%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/C2.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Category.hbm.xml (75%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Category.java (97%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Child.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Circular.hbm.xml (91%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Circular.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Commento.hbm.xml (100%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Company.java (84%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Component.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/ComponentCollection.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/ComponentNotNull.java (97%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/ComponentNotNullRoot.hbm.xml (86%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/ComponentNotNullRoot.java (98%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Componentizable.hbm.xml (84%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Componentizable.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/CompositeElement.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/CompositeIdId.hbm.xml (94%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/CompositeIdId.java (97%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Contained.java (97%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Container.hbm.xml (67%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Container.java (99%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Custom.hbm.xml (85%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Custom.java (94%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/CustomPersister.java (99%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/CustomSQL.hbm.xml (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/D.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Detail.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Down.java (92%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Drug.java (79%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/E.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Eye.hbm.xml (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Eye.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Fee.hbm.xml (93%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Fee.java (97%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Fixed.java (94%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Fo.hbm.xml (84%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Fo.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Foo.java (99%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/FooBar.hbm.xml (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/FooComponent.java (98%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/FooProxy.java (98%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Fum.hbm.xml (88%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Fum.java (98%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/FumCompositeID.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Fumm.hbm.xml (93%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Fumm.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Glarch.hbm.xml (94%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Glarch.java (99%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/GlarchProxy.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Holder.hbm.xml (80%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Holder.java (97%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/I.java (94%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/IJ.hbm.xml (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/IJ2.hbm.xml (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Immutable.hbm.xml (87%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Immutable.java (94%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Inner.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/InnerKey.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Intervention.java (94%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/J.java (92%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Jay.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/K.java (92%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Location.hbm.xml (93%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Location.java (98%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Lower.java (98%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/MainObject.hbm.xml (92%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/MainObject.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Many.hbm.xml (87%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Many.java (94%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Map.hbm.xml (100%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Marelo.hbm.xml (100%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Medication.java (53%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Middle.hbm.xml (88%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Middle.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/MiddleKey.java (97%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Mono.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/MoreStuff.java (97%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Multi.hbm.xml (72%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Multi.java (98%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/MultiExtends.hbm.xml (88%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Multiplicity.java (91%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Nameable.hbm.xml (83%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Nameable.java (92%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Named.java (90%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/NestingComponent.java (92%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/NonReflectiveBinderTest.java (54%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Object2.hbm.xml (92%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Object2.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/One.hbm.xml (85%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/One.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Outer.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/OuterKey.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Parent.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/ParentChild.hbm.xml (81%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Part.java (94%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Party.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Person.java (89%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Po.java (97%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Qux.hbm.xml (79%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Qux.java (98%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Resource.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Result.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/ReverseComparator.java (94%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Role.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Root.java (98%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/RootDetail.hbm.xml (82%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/S.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Several.java (97%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Simple.hbm.xml (91%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Simple.java (98%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Single.java (97%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/SingleSeveral.hbm.xml (87%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Sortable.java (94%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/StringComparator.java (93%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Stuff.hbm.xml (81%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Stuff.java (97%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/SubComponent.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/SubDetail.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/SubMulti.java (97%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Super.java (91%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Top.java (98%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Trivial.java (89%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/TrivialClass.java (89%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/TrivialProxy.java (89%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Up.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/UpDown.hbm.xml (82%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Vetoer.hbm.xml (92%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Vetoer.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/W.java (94%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/WZ.hbm.xml (83%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Wicked.hbm.xml (83%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/X.java (96%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/XY.hbm.xml (82%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Y.java (95%)
 rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/legacy/Z.java (93%)
 delete mode 100644 hibernate-core/src/test/java/org/hibernate/test/legacy/ABCTest.java

diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditAdressCountryTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditAdressCountryTest.java
index c548086212..ed76e1dffa 100644
--- a/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditAdressCountryTest.java
+++ b/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditAdressCountryTest.java
@@ -6,9 +6,6 @@
  */
 package org.hibernate.userguide.envers;
 
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -26,11 +23,10 @@ import org.hibernate.envers.AuditReaderFactory;
 import org.hibernate.envers.Audited;
 import org.hibernate.envers.configuration.EnversSettings;
 import org.hibernate.envers.query.AuditEntity;
-import org.hibernate.envers.query.AuditQuery;
 import org.hibernate.envers.strategy.ValidityAuditStrategy;
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 
-import org.hibernate.test.legacy.Custom;
+import org.hibernate.orm.test.legacy.Custom;
 import org.junit.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
diff --git a/etc/hibernate.cfg.xml b/etc/hibernate.cfg.xml
index ce8c3165c9..3471f87137 100644
--- a/etc/hibernate.cfg.xml
+++ b/etc/hibernate.cfg.xml
@@ -13,7 +13,7 @@
 		<property name="show_sql">true</property>
 		<mapping resource="org/hibernate/test/legacy/Simple.hbm.xml"/>
 		<class-cache
-			class="org.hibernate.test.legacy.Simple"
+			class="org.hibernate.orm.test.legacy.Simple"
 			region="Simple"
 			usage="read-write"/>
 	</session-factory>
diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/SQLFunctionsInterSystemsTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/SQLFunctionsInterSystemsTest.java
index 4d0cda4971..e122ea95eb 100644
--- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/SQLFunctionsInterSystemsTest.java
+++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/SQLFunctionsInterSystemsTest.java
@@ -27,11 +27,11 @@ import org.hibernate.jdbc.Work;
 
 import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
-import org.hibernate.test.legacy.Blobber;
-import org.hibernate.test.legacy.Broken;
-import org.hibernate.test.legacy.Fixed;
-import org.hibernate.test.legacy.Simple;
-import org.hibernate.test.legacy.Single;
+import org.hibernate.orm.test.legacy.Blobber;
+import org.hibernate.orm.test.legacy.Broken;
+import org.hibernate.orm.test.legacy.Fixed;
+import org.hibernate.orm.test.legacy.Simple;
+import org.hibernate.orm.test.legacy.Single;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java
index c594733a63..d40d2b76ea 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java
@@ -57,6 +57,7 @@ import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate;
 import org.hibernate.sql.ast.tree.predicate.InListPredicate;
 import org.hibernate.sql.ast.tree.predicate.Junction;
+import org.hibernate.sql.ast.tree.predicate.NegatedPredicate;
 import org.hibernate.sql.ast.tree.predicate.NullnessPredicate;
 import org.hibernate.sql.ast.tree.predicate.Predicate;
 import org.hibernate.type.AssociationType;
@@ -1018,13 +1019,21 @@ public class SingleTableEntityPersister extends AbstractEntityPersister {
 			}
 			return p;
 		}
+		final Object value = getDiscriminatorValue();
+		final boolean hasNotNullDiscriminator = value == NOT_NULL_DISCRIMINATOR;
+		final boolean hasNullDiscrininator = value == NULL_DISCRIMINATOR;
+		if ( hasNotNullDiscriminator || hasNullDiscrininator ) {
+			final NullnessPredicate nullnessPredicate = new NullnessPredicate( sqlExpression );
+			if ( hasNotNullDiscriminator ) {
+				return new NegatedPredicate( nullnessPredicate );
+			}
+
+			return nullnessPredicate;
+		}
 		return new ComparisonPredicate(
 				sqlExpression,
 				ComparisonOperator.EQUAL,
-				new QueryLiteral<>(
-						getDiscriminatorValue(),
-						discriminatorType
-				)
+				new QueryLiteral<>( value, discriminatorType )
 		);
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/A.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/A.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/A.java
index 901d2ac12c..b54f31f057 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/A.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 public class A {
 	private Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/ABC.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABC.hbm.xml
similarity index 82%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/ABC.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABC.hbm.xml
index 0d22871de1..19cd6ba9ed 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/ABC.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABC.hbm.xml
@@ -10,7 +10,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 
-	<class name="org.hibernate.test.legacy.A" discriminator-value="0" lazy="true" table="TA">
+	<class name="org.hibernate.orm.test.legacy.A" discriminator-value="0" lazy="true" table="TA">
 		<id name = "id" column="identifier_column" unsaved-value = "null">
 			<generator class="increment"/>
 		</id>
@@ -20,13 +20,13 @@
 			<column name="name" index="indx_a_name2"/>
 		</property>
 
-		<subclass name="org.hibernate.test.legacy.B" discriminator-value="-1" lazy="true">
+		<subclass name="org.hibernate.orm.test.legacy.B" discriminator-value="-1" lazy="true">
 			<property name="count" column="count_"/>
 			<join fetch="select" table="B2">
 				<key column="bid"/>
 				<property name="BName" not-null="true"/>
 			</join>
-			<subclass name="org.hibernate.test.legacy.C1" discriminator-value="null" lazy="true">
+			<subclass name="org.hibernate.orm.test.legacy.C1" discriminator-value="null" lazy="true">
 				<property name="address" column="c1"/>
 				<one-to-one name="d"/>
 				<join table="cmore" fetch="select">
@@ -37,7 +37,7 @@
 		</subclass>
 	</class>
 
-	<class name="org.hibernate.test.legacy.D" discriminator-value="0" proxy="org.hibernate.test.legacy.D" table="TD">
+	<class name="org.hibernate.orm.test.legacy.D" discriminator-value="0" proxy="org.hibernate.orm.test.legacy.D" table="TD">
 		<id name = "id" unsaved-value = "null">
 			<generator class="assigned"/>
 		</id>
@@ -54,7 +54,7 @@
 	</class>
 	
 	<sql-query name="propertyResultDiscriminator">
-		<return alias="a" class="org.hibernate.test.legacy.A">
+		<return alias="a" class="org.hibernate.orm.test.legacy.A">
   			<return-discriminator column="clazz"/>
 			<return-property name="id" column="identifier_column"/>
 			<return-property name="name" column="name"/>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/ABCExtends.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABCExtends.hbm.xml
similarity index 82%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/ABCExtends.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABCExtends.hbm.xml
index 749c39b24e..ec287cc982 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/ABCExtends.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABCExtends.hbm.xml
@@ -10,7 +10,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 
-	<subclass name="org.hibernate.test.legacy.C2" discriminator-value="2" extends="org.hibernate.test.legacy.B" lazy="true">
+	<subclass name="org.hibernate.orm.test.legacy.C2" discriminator-value="2" extends="org.hibernate.orm.test.legacy.B" lazy="true">
 		<property name="address" column="c2"/>
 		<join table="c2more" fetch="select">
 			<key column="c2"/>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/ABCProxy.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABCProxy.hbm.xml
similarity index 59%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/ABCProxy.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABCProxy.hbm.xml
index 44baedbd59..390508ddac 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/ABCProxy.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABCProxy.hbm.xml
@@ -10,14 +10,14 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 
-	<class name="org.hibernate.test.legacy.A" discriminator-value="0" lazy="true" table="AP">
+	<class name="org.hibernate.orm.test.legacy.A" discriminator-value="0" lazy="true" table="AP">
 		<id name="id" column="identifier_column" unsaved-value = "null">
 			<generator class="increment"/>
 		</id>
 		<discriminator column="clazz_discriminata" type="integer" force="true" not-null="false"/>
 		<property name="name"/>
-		<many-to-one name="forward" class="org.hibernate.test.legacy.E" cascade="save-update" />
-		<subclass name="org.hibernate.test.legacy.B" discriminator-value="null" lazy="true">
+		<many-to-one name="forward" class="org.hibernate.orm.test.legacy.E" cascade="save-update" />
+		<subclass name="org.hibernate.orm.test.legacy.B" discriminator-value="null" lazy="true">
 			<property name="count" column="count_"/>
 
 			<map name="map" table="`map`">
@@ -26,42 +26,42 @@
 				<element column="MAPVAL" type="int"/>
 			</map>
 
-			<subclass name="org.hibernate.test.legacy.C1" discriminator-value="1" lazy="true">
+			<subclass name="org.hibernate.orm.test.legacy.C1" discriminator-value="1" lazy="true">
 				<property name="address" column="c1"/>
 				<one-to-one name="d"/>
-				<many-to-one name="c2" column="c" class="org.hibernate.test.legacy.C2"/>
+				<many-to-one name="c2" column="c" class="org.hibernate.orm.test.legacy.C2"/>
 				<bag name="c2s" inverse="true" where="identifier_column is not null"> <!--where="clazz_discriminata=2"-->
 					<key column="c"/>
-					<one-to-many class="org.hibernate.test.legacy.C2"/>
+					<one-to-many class="org.hibernate.orm.test.legacy.C2"/>
 				</bag>
 			</subclass>
-			<subclass name="org.hibernate.test.legacy.C2" discriminator-value="2" lazy="true">
+			<subclass name="org.hibernate.orm.test.legacy.C2" discriminator-value="2" lazy="true">
 				<property name="address" column="c2"/>
-				<many-to-one name="c1" column="c" class="org.hibernate.test.legacy.C1"/>
+				<many-to-one name="c1" column="c" class="org.hibernate.orm.test.legacy.C1"/>
 				<bag name="c1s" inverse="true" > <!--where="clazz_discriminata=1"-->
 					<key column="c"/>
-					<one-to-many class="org.hibernate.test.legacy.C1"/>
+					<one-to-many class="org.hibernate.orm.test.legacy.C1"/>
 				</bag>
 			</subclass>
 		</subclass>
 	</class>
 
-	<class name="org.hibernate.test.legacy.D" discriminator-value="0" lazy="true" table="DP">
+	<class name="org.hibernate.orm.test.legacy.D" discriminator-value="0" lazy="true" table="DP">
 		<id name = "id" unsaved-value = "null">
 			<generator class="assigned"/>
 		</id>
 		<property name="amount"/>
 	</class>
 	
-	<class name="org.hibernate.test.legacy.E" discriminator-value="0" lazy="true" table="EP">
+	<class name="org.hibernate.orm.test.legacy.E" discriminator-value="0" lazy="true" table="EP">
 		<id name = "id" unsaved-value = "null">
 			<generator class="increment"/>
 		</id>
 		<property name="amount"/>
-		<one-to-one name="reverse" class="org.hibernate.test.legacy.A" property-ref="forward" cascade="save-update"/>
+		<one-to-one name="reverse" class="org.hibernate.orm.test.legacy.A" property-ref="forward" cascade="save-update"/>
 		<set name="as" lazy="true">
 			<key column="e"/>
-			<one-to-many class="org.hibernate.test.legacy.A"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.A"/>
 		</set>
 	</class>
 	
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABCTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABCTest.java
new file mode 100644
index 0000000000..1b01f90774
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABCTest.java
@@ -0,0 +1,185 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.orm.test.legacy;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.hibernate.Cache;
+import org.hibernate.boot.model.naming.Identifier;
+import org.hibernate.mapping.Index;
+import org.hibernate.mapping.Table;
+
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@DomainModel(
+		xmlMappings = {
+				"org/hibernate/orm/test/legacy/ABC.hbm.xml", "org/hibernate/orm/test/legacy/ABCExtends.hbm.xml"
+		}
+)
+@SessionFactory
+public class ABCTest {
+
+	@Test
+	public void testFormulaAssociation(SessionFactoryScope scope) {
+		Long did = 12L;
+		scope.inTransaction(
+				session -> {
+					D d = new D( did );
+					session.save( d );
+					A a = new A();
+					a.setName( "a" );
+					session.save( a );
+					d.setReverse( a );
+					d.inverse = a;
+				}
+		);
+
+		scope.inTransaction(
+				session -> {
+					D d = session.get( D.class, did );
+					assertNotNull( d.getReverse() );
+					session.clear();
+					getCache( scope ).evictEntityData( D.class );
+					getCache( scope ).evictEntityData( A.class );
+					d = session.get( D.class, did );
+					assertNotNull( d.inverse );
+					assertThat( d.inverse.getName(), is( "a" ) );
+					session.clear();
+					getCache( scope ).evictEntityData( D.class );
+					getCache( scope ).evictEntityData( A.class );
+					assertThat(
+							session.createQuery( "from D d join d.reverse r join d.inverse i where i = r" )
+									.list().size(),
+							is( 1 )
+					);
+				}
+		);
+	}
+
+	@Test
+	public void testHigherLevelIndexDefinition(SessionFactoryScope scope) {
+		Table table = scope.getMetadataImplementor()
+				.getDatabase()
+				.getDefaultNamespace()
+				.locateTable( Identifier.toIdentifier( "TA" ) );
+		Iterator<Index> indexItr = table.getIndexIterator();
+		boolean found = false;
+		while ( indexItr.hasNext() ) {
+			final Index index = indexItr.next();
+			if ( "indx_a_name".equals( index.getName() ) ) {
+				found = true;
+				break;
+			}
+		}
+		assertTrue( found, "Unable to locate indx_a_name index" );
+	}
+
+	@Test
+	public void testSubclassing(SessionFactoryScope scope) {
+		C1 c = new C1();
+		scope.inTransaction(
+				session -> {
+					D d = new D();
+					d.setAmount( 213.34f );
+					c.setAddress( "foo bar" );
+					c.setCount( 23432 );
+					c.setName( "c1" );
+					c.setBName( "a funny name" );
+					c.setD( d );
+					session.save( c );
+					d.setId( c.getId() );
+					session.save( d );
+
+					assertThat( session.createQuery( "from C2 c where 1=1 or 1=1" ).list().size(), is( 0 ) );
+				}
+		);
+
+		getCache( scope ).evictEntityData( A.class );
+
+		scope.inTransaction(
+				session -> {
+					C1 c1 = (C1) session.get( A.class, c.getId() );
+					assertTrue(
+							c1.getAddress().equals( "foo bar" ) &&
+									( c1.getCount() == 23432 ) &&
+									c1.getName().equals( "c1" ) &&
+									c1.getD().getAmount() > 213.3f
+					);
+					assertThat( c1.getBName(), is( "a funny name" ) );
+				}
+		);
+
+		getCache( scope ).evictEntityData( A.class );
+
+		scope.inTransaction(
+				session -> {
+					C1 c1 = (C1) session.get( B.class, c.getId() );
+					assertTrue(
+							c1.getAddress().equals( "foo bar" ) &&
+									( c1.getCount() == 23432 ) &&
+									c1.getName().equals( "c1" ) &&
+									c1.getD().getAmount() > 213.3f
+					);
+					assertThat( c1.getBName(), is( "a funny name" ) );
+				}
+		);
+
+		scope.inTransaction(
+				session -> {
+					C1 c1 = session.load( C1.class, c.getId() );
+					assertTrue(
+							c1.getAddress().equals( "foo bar" ) &&
+									( c1.getCount() == 23432 ) &&
+									c1.getName().equals( "c1" ) &&
+									c1.getD().getAmount() > 213.3f
+					);
+				}
+		);
+
+		scope.inTransaction(
+				session -> {
+					List<C1> bs = session.createQuery( "from B" ).list();
+					for ( C1 b : bs ) {
+						session.delete( b );
+						session.delete( b.getD() );
+					}
+				}
+		);
+	}
+
+	@Test
+	public void testGetSave(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					assertNull( session.get( D.class, 1L ) );
+					D d = new D();
+					d.setId( 1L );
+					session.save( d );
+					session.flush();
+					assertNotNull( session.get( D.class, 1L ) );
+					session.delete( d );
+					session.flush();
+				}
+		);
+	}
+
+	private Cache getCache(SessionFactoryScope scope) {
+		return scope.getSessionFactory().getCache();
+	}
+
+}
+
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Abstract.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Abstract.java
similarity index 94%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Abstract.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Abstract.java
index a3de021f4a..d86f8d9613 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Abstract.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Abstract.java
@@ -6,7 +6,8 @@
  */
 
 //$Id: Abstract.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
+
 import java.util.Set;
 
 public abstract class Abstract extends Foo implements AbstractProxy {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/AbstractProxy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/AbstractProxy.java
similarity index 60%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/AbstractProxy.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/AbstractProxy.java
index 23df75a394..9249ebc5a0 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/AbstractProxy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/AbstractProxy.java
@@ -4,14 +4,13 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
-
+package org.hibernate.orm.test.legacy;
 
 public interface AbstractProxy extends FooProxy {
-	public void setAbstracts(java.util.Set arg0);
-	public java.util.Set getAbstracts();
-	public void setTime(java.sql.Time arg0);
-	public java.sql.Time getTime();
+	void setAbstracts(java.util.Set arg0);
+	java.util.Set getAbstracts();
+	void setTime(java.sql.Time arg0);
+	java.sql.Time getTime();
 }
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/AltSimple.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/AltSimple.hbm.xml
similarity index 92%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/AltSimple.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/AltSimple.hbm.xml
index 4e0aecc467..027ece2c73 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/AltSimple.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/AltSimple.hbm.xml
@@ -10,7 +10,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 
-    <class name="org.hibernate.test.legacy.Simple" table="SIMP">
+    <class name="org.hibernate.orm.test.legacy.Simple" table="SIMP">
         <id name="id" type="long" column="id_">
             <generator class="assigned"/>
         </id>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Assignable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Assignable.java
similarity index 93%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Assignable.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Assignable.java
index 4c1defa89b..25708c87f2 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Assignable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Assignable.java
@@ -4,7 +4,8 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
+
 import java.util.Collection;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/B.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/B.java
similarity index 94%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/B.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/B.java
index a3077d42b0..385b4be859 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/B.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/B.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.util.Map;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Bar.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Bar.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Bar.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Bar.java
index 812b6692ab..5f79138809 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Bar.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Bar.java
@@ -6,8 +6,7 @@
  */
 
 //$Id: Bar.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
-
+package org.hibernate.orm.test.legacy;
 
 public class Bar extends Abstract implements BarProxy, Named {
 	private String barString;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/BarProxy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/BarProxy.java
similarity index 59%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/BarProxy.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/BarProxy.java
index 56b158d6a6..2f7dfd57e0 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/BarProxy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/BarProxy.java
@@ -6,18 +6,18 @@
  */
 
 //$Id: BarProxy.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 public interface BarProxy extends AbstractProxy {
-	public void setBaz(Baz arg0);
-	public Baz getBaz();
-	public void setBarComponent(FooComponent arg0);
-	public FooComponent getBarComponent();
+	void setBaz(Baz arg0);
+	Baz getBaz();
+	void setBarComponent(FooComponent arg0);
+	FooComponent getBarComponent();
 	//public void setBarString(String arg0);
-	public String getBarString();
-	public Object getObject();
-	public void setObject(Object o);
+	String getBarString();
+	Object getObject();
+	void setObject(Object o);
 }
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/BasicNameable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/BasicNameable.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/BasicNameable.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/BasicNameable.java
index 22dd0a1176..a219eb02f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/BasicNameable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/BasicNameable.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: BasicNameable.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Baz.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Baz.hbm.xml
similarity index 75%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Baz.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Baz.hbm.xml
index 8c0065979d..b0bc671333 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Baz.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Baz.hbm.xml
@@ -10,7 +10,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 
-	<class name="org.hibernate.test.legacy.Baz" 
+	<class name="org.hibernate.orm.test.legacy.Baz"
 		table="baz" 
 		check="count_count > -666">
 		<id name="code" type="string">
@@ -20,7 +20,7 @@
 		<property name="count" column="count_count"/>
 		<property name="name" column="name_b"/>
 		<!--property name="text" type="text" column="text_"/-->
-		<many-to-one name="foo" outer-join="true" class="org.hibernate.test.legacy.Foo"/>
+		<many-to-one name="foo" outer-join="true" class="org.hibernate.orm.test.legacy.Foo"/>
 
 		<list name="stringList" table="string_list" batch-size="12">
 			<key>
@@ -40,20 +40,20 @@
 			<key>
 				<column name="baz_id" length="16"/>
 			</key>
-			<one-to-many class="org.hibernate.test.legacy.Foo"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Foo"/>
 		</set>
 		<array name="components" table="bazcomponents">
 			<key>
 				<column name="baz_id" length="16"/>
 			</key>
 			<index column="i"/>
-			<composite-element class="org.hibernate.test.legacy.FooComponent">
+			<composite-element class="org.hibernate.orm.test.legacy.FooComponent">
 				<parent name="baz"/>
 				<property name="name">
 					<column name="name" length="56"/>
 				</property>
 				<property name="count" column="count_"/>
-				<nested-composite-element name="subcomponent" class="org.hibernate.test.legacy.FooComponent">
+				<nested-composite-element name="subcomponent" class="org.hibernate.orm.test.legacy.FooComponent">
 					<property name="name" column="x_"/>
 					<property name="count" column="y_"/>
 				</nested-composite-element>
@@ -76,52 +76,52 @@
 			<key>
 				<column name="baz_id" length="16"/>
 			</key>
-			<index-many-to-many column="foo_id" class="org.hibernate.test.legacy.Foo"/>
-			<many-to-many column="glarch_id" class="org.hibernate.test.legacy.Glarch"/>
+			<index-many-to-many column="foo_id" class="org.hibernate.orm.test.legacy.Foo"/>
+			<many-to-many column="glarch_id" class="org.hibernate.orm.test.legacy.Glarch"/>
 		</map>
 		<map name="fooComponentToFoo">
 			<!--cache-->
 			<key>
 				<column name="baz_id" length="16"/>
 			</key>
-			<composite-index class="org.hibernate.test.legacy.FooComponent">
+			<composite-index class="org.hibernate.orm.test.legacy.FooComponent">
 				<key-property name="name" length="32"/>
 				<key-property name="count" column="count_"/>
 			</composite-index>
-			<many-to-many column="foo_id" class="org.hibernate.test.legacy.Foo" outer-join="true"/>
+			<many-to-many column="foo_id" class="org.hibernate.orm.test.legacy.Foo" outer-join="true"/>
 		</map>
 		<map name="glarchToFoo">
 			<key>
 				<column name="gtf_baz_id" length="16"/>
 			</key>
-			<index-many-to-many column="gtf_foo_id" class="org.hibernate.test.legacy.Foo"/>
-			<one-to-many class="org.hibernate.test.legacy.Glarch"/>
+			<index-many-to-many column="gtf_foo_id" class="org.hibernate.orm.test.legacy.Foo"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Glarch"/>
 		</map>
 		
-		<set name="stringSet" lazy="true" sort="org.hibernate.test.legacy.StringComparator" batch-size="12">
+		<set name="stringSet" lazy="true" sort="org.hibernate.orm.test.legacy.StringComparator" batch-size="12">
 			<!--<cache usage="read-write"/>-->
 			<key column="id_"/>
 			<element column="element" type="string" not-null="true" length="32"/>
 		</set>
 	
-		<map name="stringDateMap" lazy="true" sort="org.hibernate.test.legacy.ReverseComparator">
+		<map name="stringDateMap" lazy="true" sort="org.hibernate.orm.test.legacy.ReverseComparator">
 			<key column="id_"/>
 			<index column="map_key" type="string" length="32"/>
 			<element column="map_value" type="date"/>
 		</map>
 	
-		<array name="fooArray" table="FOO_ARRAY" element-class="org.hibernate.test.legacy.FooProxy" where="i&lt;8" check="i>=0">
+		<array name="fooArray" table="FOO_ARRAY" element-class="org.hibernate.orm.test.legacy.FooProxy" where="i&lt;8" check="i>=0">
 			<!--cache-->
 			<key column="id_"/>
 			<index column="i"/>
-			<many-to-many class="org.hibernate.test.legacy.Foo" fetch="select">
+			<many-to-many class="org.hibernate.orm.test.legacy.Foo" fetch="select">
 				<column name="foo" length="36"/>
 			</many-to-many>
 		</array>
 	
 		<bag name="fooBag" lazy="true" table="baz_foo" cascade="all-delete-orphan" inverse="false">
 			<key column="baz"/>
-			<many-to-many class="org.hibernate.test.legacy.Foo" column="foo" outer-join="true"/>
+			<many-to-many class="org.hibernate.orm.test.legacy.Foo" column="foo" outer-join="true"/>
 		</bag>
 	
 		<idbag name="idFooBag" lazy="true" table="baz_id_foo" cascade="all">
@@ -129,7 +129,7 @@
 				<generator class="increment"/>
 			</collection-id>
 			<key column="baz"/>
-			<many-to-many class="org.hibernate.test.legacy.Foo" column="foo" outer-join="true"/>
+			<many-to-many class="org.hibernate.orm.test.legacy.Foo" column="foo" outer-join="true"/>
 		</idbag>
 	
 		<idbag name="byteBag" lazy="true" table="baz_byte_bag">
@@ -149,14 +149,14 @@
 		<list name="fees" lazy="true" cascade="all" check="bazind is null or (bazind>=0 and bazind&lt;10)">
 			<key column="bazid"/>
 			<index column="bazind"/>
-			<one-to-many class="org.hibernate.test.legacy.Fee"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Fee"/>
 		</list>
 
 		<list name="topComponents" table="topcomponents">
 			<!--cache-->
 			<key column="id_"/>
 			<index column="i"/>
-			<composite-element class="org.hibernate.test.legacy.FooComponent">
+			<composite-element class="org.hibernate.orm.test.legacy.FooComponent">
 				<property name="name"/>
 				<property name="count" column="count_"/>
 			</composite-element>
@@ -164,12 +164,12 @@
 		
 		<set name="topFoos">
 			<key column="idtopbar" />
-			<one-to-many class = "org.hibernate.test.legacy.Bar"/>
+			<one-to-many class = "org.hibernate.orm.test.legacy.Bar"/>
 		</set>
 	
 		<set name="cascadingBars" cascade="all-delete-orphan">
 			<key column="idofbaz" />
-			<one-to-many class = "org.hibernate.test.legacy.Bar"/>
+			<one-to-many class = "org.hibernate.orm.test.legacy.Bar"/>
 		</set>
 	
 		<map name="topGlarchez" outer-join="true">
@@ -177,13 +177,13 @@
 			<index type="character">
 				<column name="mapkey" sql-type="char(1)"/>
 			</index>
-			<one-to-many class = "org.hibernate.test.legacy.Glarch"/>
+			<one-to-many class = "org.hibernate.orm.test.legacy.Glarch"/>
 		</map>
 		
 		<set name="cached" sort="natural" table="cached_set">
 			<!--cache-->
 			<key column="baz"/>
-			<composite-element class="org.hibernate.test.legacy.CompositeElement">
+			<composite-element class="org.hibernate.orm.test.legacy.CompositeElement">
 				<property name="foo" not-null="true"/>
 				<property name="bar" not-null="true"/>
 			</composite-element>
@@ -192,8 +192,8 @@
 		<map name="cachedMap" sort="natural" table="cached_map">
 			<!--cache-->
 			<key column="baz"/>
-			<index-many-to-many column="another_baz" class="org.hibernate.test.legacy.Baz"/>
-			<composite-element class="org.hibernate.test.legacy.CompositeElement">
+			<index-many-to-many column="another_baz" class="org.hibernate.orm.test.legacy.Baz"/>
+			<composite-element class="org.hibernate.orm.test.legacy.CompositeElement">
 				<property name="foo"/>
 				<property name="bar"/>
 			</composite-element>
@@ -202,7 +202,7 @@
 		<map name="stringGlarchMap" where="baz_map_index &gt; 'a' and tha_key is not null" cascade="all">
 			<key column="baz_map_id"/>
 			<index column="baz_map_index" type="string"/>
-			<one-to-many class="org.hibernate.test.legacy.Glarch"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Glarch"/>
 		</map>
 		
 		<map name="anyToAny" lazy="true">
@@ -228,27 +228,27 @@
 		
 		<bag name="bazez" lazy="true" order-by="name_b desc" cascade="all">
 			<key column="`baz-id`"/>
-			<one-to-many class="org.hibernate.test.legacy.Baz"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Baz"/>
 		</bag>
 		
 		<set name="sortablez" sort="natural" cascade="all">
 			<key column="baz"/>
-			<one-to-many class="org.hibernate.test.legacy.Sortable"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Sortable"/>
 		</set>
 		
 		<bag name="parts" lazy="true" cascade="save-update">
 			<key column="baz"/>
-			<one-to-many class="org.hibernate.test.legacy.Part"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Part"/>
 		</bag>
 		
 		<bag name="moreParts" lazy="true" cascade="save-update">
 			<key column="baz"/>
-			<many-to-many column="part" class="org.hibernate.test.legacy.Part"/>
+			<many-to-many column="part" class="org.hibernate.orm.test.legacy.Part"/>
 		</bag>
 		
 		<bag name="subs" inverse="true" cascade="all" access="field">
 			<key column="superBaz" on-delete="cascade"/>
-			<one-to-many class="org.hibernate.test.legacy.Baz"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Baz"/>
 		</bag>
 		
 		<many-to-one name="superBaz" access="field"/>
@@ -258,7 +258,7 @@
 				<property name="str" column="`str`"/>
 				<bag name="foos" cascade="all">
 					<key column="baz_compon_id"/>
-					<one-to-many class="org.hibernate.test.legacy.Foo"/>
+					<one-to-many class="org.hibernate.orm.test.legacy.Foo"/>
 				</bag>
 				<bag name="floats" table="baz_floats_bag">
 					<key column="baz_compon_id"/>
@@ -269,20 +269,20 @@
 		
 	</class>
 	
-	<class name="org.hibernate.test.legacy.Sortable">
+	<class name="org.hibernate.orm.test.legacy.Sortable">
 		<id name="id">
 			<generator class="native"/>
 		</id>
 		<property name="name"/>
 	</class>
 	
-	<class name="org.hibernate.test.legacy.Part" where="description like 'x%'">
+	<class name="org.hibernate.orm.test.legacy.Part" where="description like 'x%'">
 		<id name="id">
 			<generator class="native"/>
 		</id>
 		<discriminator column="clazz"/>
 		<property name="description"/>
-		<subclass name="org.hibernate.test.legacy.Part$SpecialPart"/>
+		<subclass name="org.hibernate.orm.test.legacy.Part$SpecialPart"/>
 	</class>
 	
 	
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Baz.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Baz.java
similarity index 99%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Baz.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Baz.java
index 39f3131b09..5f75f90aa1 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Baz.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Baz.java
@@ -6,7 +6,8 @@
  */
 
 //$Id: Baz.java 4688 2004-10-26 09:10:50Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Blobber.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Blobber.hbm.xml
similarity index 89%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Blobber.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Blobber.hbm.xml
index f5ce16d1b5..b89c96c67e 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Blobber.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Blobber.hbm.xml
@@ -9,7 +9,7 @@
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
-	<class name="org.hibernate.test.legacy.Blobber" dynamic-update="true">
+	<class name="org.hibernate.orm.test.legacy.Blobber" dynamic-update="true">
 		<id name="id">
 			<generator class="increment"/>
 		</id>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Blobber.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Blobber.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Blobber.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Blobber.java
index 829ba87139..3f2462b59a 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Blobber.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Blobber.java
@@ -4,7 +4,8 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
+
 import java.sql.Blob;
 import java.sql.Clob;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Broken.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Broken.hbm.xml
similarity index 83%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Broken.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Broken.hbm.xml
index 929ba846c3..023d68c501 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Broken.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Broken.hbm.xml
@@ -10,7 +10,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 
-    <class name="org.hibernate.test.legacy.Broken" table="BROKE">
+    <class name="org.hibernate.orm.test.legacy.Broken" table="BROKE">
         <!--id name="id" type="long" column="id_">
             <generator class="increment"/>
         </id-->
@@ -19,7 +19,7 @@
         	<key-property name="otherId"/>
         </composite-id>
         <timestamp name="timestamp" column="`timestamp`"/>
-        <joined-subclass name="org.hibernate.test.legacy.Fixed" table="FIX">
+        <joined-subclass name="org.hibernate.orm.test.legacy.Fixed" table="FIX">
         	<key>
         		<column name="BROKE_ID"/>
         		<column name="OTHER_BROKE_ID"/>
@@ -29,7 +29,7 @@
                 	<column name="FIX_ID"/>
                 	<column name="OTHER_FIX_ID"/>
                 </key>
-                <one-to-many class="org.hibernate.test.legacy.Broken"/>
+                <one-to-many class="org.hibernate.orm.test.legacy.Broken"/>
             </set>
             <property name="list" type="serializable"/>
         </joined-subclass>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Broken.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Broken.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Broken.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Broken.java
index 08b1095efe..a0e76d0503 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Broken.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Broken.java
@@ -6,7 +6,8 @@
  */
 
 //$Id: Broken.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
+
 import java.io.Serializable;
 import java.util.Date;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/C1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/C1.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/C1.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/C1.java
index c655ee4848..82f8f429c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/C1.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/C1.java
@@ -6,7 +6,8 @@
  */
 
 //$Id: C1.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
+
 import java.util.ArrayList;
 import java.util.Collection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/C2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/C2.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/C2.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/C2.java
index fc3bf4e4a7..1e5397f205 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/C2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/C2.java
@@ -6,7 +6,8 @@
  */
 
 //$Id: C2.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
+
 import java.util.ArrayList;
 import java.util.Collection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Category.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Category.hbm.xml
similarity index 75%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Category.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Category.hbm.xml
index ba81804ad0..5202938daf 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Category.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Category.hbm.xml
@@ -10,7 +10,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 
-	<class name="org.hibernate.test.legacy.Category" 
+	<class name="org.hibernate.orm.test.legacy.Category"
 		table="category"
 		dynamic-update="true"
 		dynamic-insert="true">
@@ -23,7 +23,7 @@
 		    <!--cache-->
 			<key column="parent"/>
 			<index column="ord"/>
-			<one-to-many class="org.hibernate.test.legacy.Category"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Category"/>
 		</list>
 
 		<property name="name"/>
@@ -31,25 +31,25 @@
 
 	</class>
 
-	<class name="org.hibernate.test.legacy.Assignable" table="`assign-able`">
+	<class name="org.hibernate.orm.test.legacy.Assignable" table="`assign-able`">
 		<id name="id">
 			<generator class="assigned"/>
 		</id>
 
 		<bag name="categories" inverse="true" cascade="all" lazy="true">
 			<key column="`assign-able-id`"/>
-			<one-to-many class="org.hibernate.test.legacy.Category"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Category"/>
 		</bag>
 	</class>
 
 	<sql-query name="namedsql">
-		<return alias="category" class="org.hibernate.test.legacy.Category"/>
-		<return alias="assignable" class="org.hibernate.test.legacy.Assignable"/>		
+		<return alias="category" class="org.hibernate.orm.test.legacy.Category"/>
+		<return alias="assignable" class="org.hibernate.orm.test.legacy.Assignable"/>
 		select {category.*}, {assignable.*} from category {category}, "assign-able" {assignable}	
 	</sql-query>
 
 	<sql-query name="nonaliasedsql">
-		<return alias="category" class="org.hibernate.test.legacy.Category">
+		<return alias="category" class="org.hibernate.orm.test.legacy.Category">
 			<return-property name="id" column="category_key_col"/>
 			<return-property name="name" column="name"/>
 			<return-property name="assignable" column="assignid"/>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Category.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Category.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Category.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Category.java
index 822f9811b0..9b18cbe27b 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Category.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Category.java
@@ -6,7 +6,8 @@
  */
 
 //$Id: Category.java 5686 2005-02-12 07:27:32Z steveebersole $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
+
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Child.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Child.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Child.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Child.java
index e57a7e8c6b..b72a12b786 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Child.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Child.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Child.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 public class Child {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Circular.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Circular.hbm.xml
similarity index 91%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Circular.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Circular.hbm.xml
index c5bdf9bb05..b704a1b6fe 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Circular.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Circular.hbm.xml
@@ -10,7 +10,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false" default-cascade="save-update">
 
-    <class name="org.hibernate.test.legacy.Circular" dynamic-update="true">
+    <class name="org.hibernate.orm.test.legacy.Circular" dynamic-update="true">
         <id name="id" column="id_" length="64" unsaved-value="null">
             <generator class="uuid"/>
         </id>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Circular.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Circular.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Circular.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Circular.java
index e6b059ad90..9f19e9d5fa 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Circular.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Circular.java
@@ -6,23 +6,22 @@
  */
 
 //$Id: Circular.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
-
+package org.hibernate.orm.test.legacy;
 
 public class Circular {
-	
+
 	private String id;
 	private Class clazz;
 	private Circular other;
 	private Object anyEntity;
-	
+
 	/**
 	 * Constructor for Circular.
 	 */
 	public Circular() {
 		super();
 	}
-	
+
 	/**
 	 * Returns the clazz.
 	 * @return Class
@@ -30,7 +29,7 @@ public class Circular {
 	public Class getClazz() {
 		return clazz;
 	}
-	
+
 	/**
 	 * Returns the id.
 	 * @return String
@@ -38,7 +37,7 @@ public class Circular {
 	public String getId() {
 		return id;
 	}
-	
+
 	/**
 	 * Sets the clazz.
 	 * @param clazz The clazz to set
@@ -46,7 +45,7 @@ public class Circular {
 	public void setClazz(Class clazz) {
 		this.clazz = clazz;
 	}
-	
+
 	/**
 	 * Sets the id.
 	 * @param id The id to set
@@ -54,7 +53,7 @@ public class Circular {
 	public void setId(String id) {
 		this.id = id;
 	}
-	
+
 	/**
 	 * Returns the other.
 	 * @return Circular
@@ -62,7 +61,7 @@ public class Circular {
 	public Circular getOther() {
 		return other;
 	}
-	
+
 	/**
 	 * Sets the other.
 	 * @param other The other to set
@@ -70,7 +69,7 @@ public class Circular {
 	public void setOther(Circular other) {
 		this.other = other;
 	}
-	
+
 	/**
 	 * Returns the anyEntity.
 	 * @return Object
@@ -78,7 +77,7 @@ public class Circular {
 	public Object getAnyEntity() {
 		return anyEntity;
 	}
-	
+
 	/**
 	 * Sets the anyEntity.
 	 * @param anyEntity The anyEntity to set
@@ -86,7 +85,7 @@ public class Circular {
 	public void setAnyEntity(Object anyEntity) {
 		this.anyEntity = anyEntity;
 	}
-	
+
 }
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Commento.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Commento.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Commento.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Commento.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Company.java
similarity index 84%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Company.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Company.java
index 97dafea570..6c6535d0c6 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Company.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Company.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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 /**
  * @author hbm2java
  */
-public class Company extends org.hibernate.test.legacy.Party {
+public class Company extends org.hibernate.orm.test.legacy.Party {
 
    java.lang.String id;
    java.lang.String president;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Component.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Component.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Component.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Component.java
index 5692beadeb..b9e8521ec8 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Component.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Component.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Component.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentCollection.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentCollection.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentCollection.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentCollection.java
index 899e8589b8..33e25cfde2 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentCollection.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentCollection.java
@@ -6,7 +6,8 @@
  */
 
 //$Id: ComponentCollection.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
+
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentNotNull.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentNotNull.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentNotNull.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentNotNull.java
index 9ae0ead57e..590b131bdc 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentNotNull.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentNotNull.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: ComponentNotNull.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentNotNullRoot.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentNotNullRoot.hbm.xml
similarity index 86%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentNotNullRoot.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentNotNullRoot.hbm.xml
index 6a1fe999e3..3119c15f0a 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentNotNullRoot.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentNotNullRoot.hbm.xml
@@ -11,7 +11,7 @@
 
 <hibernate-mapping default-lazy="false">
 
-	<class name="org.hibernate.test.legacy.ComponentNotNullRoot"> <!-- discriminator-value="A"> -->
+	<class name="org.hibernate.orm.test.legacy.ComponentNotNullRoot"> <!-- discriminator-value="A"> -->
 		<id name="id" column="container_id">
 			<generator class="native" />
 		</id>
@@ -31,7 +31,7 @@
 		<list name="components" lazy="true" table="CompNotNullRoot_Comps">
 			<key column = "container_id"/>
 			<index column = "list_index"/>
-			<composite-element class="org.hibernate.test.legacy.ComponentNotNullRoot$ContainerInnerClass">
+			<composite-element class="org.hibernate.orm.test.legacy.ComponentNotNullRoot$ContainerInnerClass">
 				<property name="name"/>
 				<property name="count" column="count_"/>
 				<many-to-one name="simple" not-null="true" cascade="save-update"/>
@@ -43,12 +43,12 @@
 		<list name="componentsImplicit" lazy="true" table="CompNotNullRoot_CompsImpl">
 			<key column = "container_id"/>
 			<index column = "list_index3"/>
-			<composite-element class="org.hibernate.test.legacy.ComponentNotNullRoot$ContainerInnerClass">
+			<composite-element class="org.hibernate.orm.test.legacy.ComponentNotNullRoot$ContainerInnerClass">
 				<property name="name"/>
 				<property name="count" column="count_"/>
 				<many-to-one name="simple" cascade="save-update"/>
 				<many-to-one name="one" cascade="save-update"/>
-				<nested-composite-element name="nested" class="org.hibernate.test.legacy.ComponentNotNullRoot$ContainerInnerClass">
+				<nested-composite-element name="nested" class="org.hibernate.orm.test.legacy.ComponentNotNullRoot$ContainerInnerClass">
 					<property name="nestedproperty" not-null="true"/>
 				</nested-composite-element>
 			</composite-element>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentNotNullRoot.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentNotNullRoot.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentNotNullRoot.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentNotNullRoot.java
index caa3ff0d4e..a94f065a64 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentNotNullRoot.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ComponentNotNullRoot.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 import java.util.List;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Componentizable.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Componentizable.hbm.xml
similarity index 84%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Componentizable.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Componentizable.hbm.xml
index c85fa01ad2..6b3520a95c 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Componentizable.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Componentizable.hbm.xml
@@ -9,14 +9,14 @@
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
-	<class name="org.hibernate.test.legacy.Componentizable">
+	<class name="org.hibernate.orm.test.legacy.Componentizable">
 		<id name="id">
 			<generator class="native"/>
 		</id>
 		<property name="nickName"/>
-		<component name="component" access="property" class="org.hibernate.test.legacy.Component">
+		<component name="component" access="property" class="org.hibernate.orm.test.legacy.Component">
 			<property name="name"/>
-			<component name="subComponent" class="org.hibernate.test.legacy.SubComponent">
+			<component name="subComponent" class="org.hibernate.orm.test.legacy.SubComponent">
 		   	<property name="subName"/>
 		   	<property name="subName1"/>
 	  		</component>
@@ -24,7 +24,7 @@
 	</class>
 	
 	<sql-query name="queryComponentWithOtherColumn">
-	 <return class="org.hibernate.test.legacy.Componentizable">
+	 <return class="org.hibernate.orm.test.legacy.Componentizable">
 	   <return-property name="nickName" column="n2"/>
 	   <return-property name="component.subComponent.subName">
          <return-column name="otherSubName"/>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Componentizable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Componentizable.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Componentizable.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Componentizable.java
index adc6da1887..98e506f005 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Componentizable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Componentizable.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Componentizable.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/CompositeElement.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeElement.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/CompositeElement.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeElement.java
index 67521a29d7..69f0e22ff9 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/CompositeElement.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeElement.java
@@ -6,7 +6,8 @@
  */
 
 //$Id: CompositeElement.java 6844 2005-05-21 14:22:16Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
+
 import java.io.Serializable;
 
 public class CompositeElement implements Comparable, Serializable {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/CompositeIdId.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeIdId.hbm.xml
similarity index 94%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/CompositeIdId.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeIdId.hbm.xml
index 0423b27fcc..57dca72389 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/CompositeIdId.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeIdId.hbm.xml
@@ -6,7 +6,7 @@
   ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
   -->
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.hibernate.test.legacy">
+<hibernate-mapping package="org.hibernate.orm.test.legacy">
    <class name="CompositeIdId"> 
       <composite-id> 
          <key-property name="user"/>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/CompositeIdId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeIdId.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/CompositeIdId.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeIdId.java
index 3f1cb79341..78453cd2af 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/CompositeIdId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CompositeIdId.java
@@ -9,7 +9,8 @@
  * Created on 20-Dec-2004
  *
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
+
 import java.io.Serializable;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Contained.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Contained.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Contained.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Contained.java
index 360b434fa1..0a1e5535e5 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Contained.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Contained.java
@@ -6,7 +6,8 @@
  */
 
 //$Id: Contained.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
+
 import java.util.ArrayList;
 import java.util.Collection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Container.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Container.hbm.xml
similarity index 67%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Container.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Container.hbm.xml
index ea498cd4c6..361906d9dd 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Container.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Container.hbm.xml
@@ -12,28 +12,28 @@
 
 <hibernate-mapping default-lazy="false" auto-import="false">
 
-	<import class="org.hibernate.test.legacy.Container" rename="ContainerX"/>
-	<import class="org.hibernate.test.legacy.Contained"/>
+	<import class="org.hibernate.orm.test.legacy.Container" rename="ContainerX"/>
+	<import class="org.hibernate.orm.test.legacy.Contained"/>
 	<import class="java.lang.Object" rename="Universe"/>
 
-	<class name="org.hibernate.test.legacy.Container" proxy="org.hibernate.test.legacy.Container">
+	<class name="org.hibernate.orm.test.legacy.Container" proxy="org.hibernate.orm.test.legacy.Container">
 		<id name="id" column="container_id" unsaved-value="0">
 			<generator class="native" />
 		</id>
 		<list name="oneToMany" lazy="true">
 			<key column = "container_id1"/>
 			<index column = "list_index"/>
-			<one-to-many class="org.hibernate.test.legacy.Simple"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Simple"/>
 		</list>
 		<list name="manyToMany" lazy="true">
 			<key column = "container_id2"/>
 			<index column = "list_index"/>
-			<many-to-many class="org.hibernate.test.legacy.Simple"/>
+			<many-to-many class="org.hibernate.orm.test.legacy.Simple"/>
 		</list>
 		<list name="components" lazy="true">
 			<key column = "container_id"/>
 			<index column = "list_index"/>
-			<composite-element class="org.hibernate.test.legacy.Container$ContainerInnerClass">
+			<composite-element class="org.hibernate.orm.test.legacy.Container$ContainerInnerClass">
 				<property name="name"/>
 				<property name="count" column="count_"/>
 				<many-to-one name="simple"/>
@@ -43,7 +43,7 @@
 		</list>
 		<set name="composites" lazy="true">
 			<key column = "container_id"/>
-			<composite-element class="org.hibernate.test.legacy.Container$ContainerInnerClass">
+			<composite-element class="org.hibernate.orm.test.legacy.Container$ContainerInnerClass">
 				<property name="name"/>
 				<many-to-one name="simple"/>
 				<many-to-one name="one"/>
@@ -52,7 +52,7 @@
 		</set>
 		<bag name="cascades" cascade="all" table="abcd">
 			<key column="container_id"/>
-			<composite-element class="org.hibernate.test.legacy.Container$ContainerInnerClass">
+			<composite-element class="org.hibernate.orm.test.legacy.Container$ContainerInnerClass">
 				<property name="name"/>
 				<many-to-one name="simple" cascade="all"/>
 				<many-to-one name="one" cascade="all" not-null="true"/>
@@ -61,17 +61,17 @@
 		</bag>
 		<bag name="bag" inverse="true" cascade="save-update" table="CCBAG">
 			<key column="container_id"/>
-			<many-to-many column="contained_id" class="org.hibernate.test.legacy.Contained" outer-join="true"/>
+			<many-to-many column="contained_id" class="org.hibernate.orm.test.legacy.Contained" outer-join="true"/>
 		</bag>
 		<bag name="lazyBag" inverse="true" lazy="true" table="LCCBAG" cascade="save-update">
 			<!--cache usage="read-write"-->
 			<key column="container_id"/>
-			<many-to-many column="contained_id" class="org.hibernate.test.legacy.Contained"/>
+			<many-to-many column="contained_id" class="org.hibernate.orm.test.legacy.Contained"/>
 		</bag>
 		<map name="ternaryMap">
 			<key column="container_id"/>
 			<index column="idx" type="string" length="32"/>
-			<composite-element class="org.hibernate.test.legacy.Container$Ternary">
+			<composite-element class="org.hibernate.orm.test.legacy.Container$Ternary">
 				<property name="name"/>
 				<many-to-one name="foo"/>
 				<many-to-one name="glarch"/>
@@ -79,7 +79,7 @@
 		</map>
 		<set name="ternarySet">
 			<key column="container_id"/>
-			<composite-element class="org.hibernate.test.legacy.Container$Ternary">
+			<composite-element class="org.hibernate.orm.test.legacy.Container$Ternary">
 				<property name="name" not-null="true"/>
 				<many-to-one name="foo" not-null="true"/>
 				<many-to-one name="glarch" not-null="true"/>
@@ -87,17 +87,17 @@
 		</set>
 	</class>
 	
-	<class name="org.hibernate.test.legacy.Contained" proxy="org.hibernate.test.legacy.Contained">
+	<class name="org.hibernate.orm.test.legacy.Contained" proxy="org.hibernate.orm.test.legacy.Contained">
 		<id name="id" column="container_id" unsaved-value="0">
 			<generator class="native" />
 		</id>
 		<bag name="bag" table="CCBAG">
 			<key column="contained_id"/>
-			<many-to-many column="container_id" class="org.hibernate.test.legacy.Container" outer-join="false"/>
+			<many-to-many column="container_id" class="org.hibernate.orm.test.legacy.Container" outer-join="false"/>
 		</bag>
 		<bag name="lazyBag" lazy="true" table="LCCBAG">
 			<key column="contained_id"/>
-			<many-to-many column="container_id" class="org.hibernate.test.legacy.Container"/>
+			<many-to-many column="container_id" class="org.hibernate.orm.test.legacy.Container"/>
 		</bag>
 	</class>
 	
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Container.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Container.java
similarity index 99%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Container.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Container.java
index 01a208a0e9..f2a247740f 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Container.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Container.java
@@ -6,7 +6,8 @@
  */
 
 //$Id: Container.java 6844 2005-05-21 14:22:16Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Custom.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Custom.hbm.xml
similarity index 85%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Custom.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Custom.hbm.xml
index 9b48143df4..9f81e49fa3 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Custom.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Custom.hbm.xml
@@ -10,7 +10,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 
-    <class name="org.hibernate.test.legacy.Custom" persister="org.hibernate.test.legacy.CustomPersister">
+    <class name="org.hibernate.orm.test.legacy.Custom" persister="org.hibernate.orm.test.legacy.CustomPersister">
         <id type="string" name="id" column="id_" length="64" unsaved-value="null" access="field">
             <generator class="uuid.hex"/>
         </id>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Custom.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Custom.java
similarity index 94%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Custom.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Custom.java
index 3853562b12..09420e9108 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Custom.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Custom.java
@@ -6,9 +6,7 @@
  */
 
 //$Id: Custom.java 7275 2005-06-22 18:58:16Z oneovthafew $
-package org.hibernate.test.legacy;
-
-
+package org.hibernate.orm.test.legacy;
 
 public class Custom implements Cloneable {
 	String id;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/CustomPersister.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CustomPersister.java
similarity index 99%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/CustomPersister.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CustomPersister.java
index 77d79d385e..185e014729 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/CustomPersister.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CustomPersister.java
@@ -4,10 +4,9 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 import java.io.Serializable;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Hashtable;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/CustomSQL.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CustomSQL.hbm.xml
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/CustomSQL.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CustomSQL.hbm.xml
index fad1c47f7a..778fb38acb 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/CustomSQL.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CustomSQL.hbm.xml
@@ -8,7 +8,7 @@
 <!DOCTYPE hibernate-mapping PUBLIC
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping default-lazy="false" package="org.hibernate.test.legacy">
+<hibernate-mapping default-lazy="false" package="org.hibernate.orm.test.legacy">
 	<class name="Role" table="`Role`">
 
 		<id name="id" type="long">
@@ -99,7 +99,7 @@
 		
 		<joined-subclass name="Medication">
 			<key column="interventionid"/>
-			<many-to-one name="prescribedDrug" class="org.hibernate.test.legacy.Drug"/>			
+			<many-to-one name="prescribedDrug" class="org.hibernate.orm.test.legacy.Drug"/>
 			<sql-insert>insert into /** put weird comments here */ Medication (prescribedDrug, interventionid) values (?, ?)</sql-insert> 
 		</joined-subclass>
 		
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/D.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/D.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/D.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/D.java
index 07a0976507..e07680e261 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/D.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/D.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: D.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 public class D {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Detail.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Detail.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Detail.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Detail.java
index 441fc7e256..512c6e42b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Detail.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Detail.java
@@ -6,7 +6,8 @@
  */
 
 //$Id: Detail.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
+
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Down.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Down.java
similarity index 92%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Down.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Down.java
index c34b8e18a7..ac82df7f30 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Down.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Down.java
@@ -6,9 +6,7 @@
  */
 
 //$Id: Down.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
-
-
+package org.hibernate.orm.test.legacy;
 
 /**
  * @author Gavin King
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Drug.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Drug.java
similarity index 79%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Drug.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Drug.java
index be2ce166d8..f05a67468c 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Drug.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Drug.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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
-
+package org.hibernate.orm.test.legacy;
 
 /**
  * @author hbm2java
  */
-public class Drug extends org.hibernate.test.legacy.Resource {
+public class Drug extends org.hibernate.orm.test.legacy.Resource {
 
    java.lang.String id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/E.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/E.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/E.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/E.java
index 60d127d7be..71f6e3fe57 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/E.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/E.java
@@ -6,7 +6,8 @@
  */
 
 //$Id: E.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
+
 import java.util.Set;
 
 public class E {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Eye.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Eye.hbm.xml
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Eye.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Eye.hbm.xml
index 83a1c62cfd..1917558d96 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Eye.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Eye.hbm.xml
@@ -10,7 +10,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false"
 	default-cascade="save-update"
-	package="org.hibernate.test.legacy">
+	package="org.hibernate.orm.test.legacy">
 	
 	<class name="Eye" lazy="true">
 		<id name="id" unsaved-value="0">
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Eye.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Eye.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Eye.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Eye.java
index fd98cf917e..db33692a30 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Eye.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Eye.java
@@ -6,7 +6,8 @@
  */
 
 //$Id: Eye.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
+
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fee.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fee.hbm.xml
similarity index 93%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Fee.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fee.hbm.xml
index 8f5632a281..7a0d512738 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fee.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fee.hbm.xml
@@ -10,7 +10,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 
-    <class name="org.hibernate.test.legacy.Fee" table="`the fees`">
+    <class name="org.hibernate.orm.test.legacy.Fee" table="`the fees`">
         <id type="string" name="key" column="id_" length="64" unsaved-value="null">
             <generator class="uuid"/>
         </id>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fee.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Fee.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fee.java
index 31a597233a..b47dba76e7 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fee.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fee.java
@@ -6,7 +6,8 @@
  */
 
 //$Id: Fee.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
+
 import java.io.Serializable;
 import java.util.Set;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fixed.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fixed.java
similarity index 94%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Fixed.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fixed.java
index 009ac54036..cbc5de0e93 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fixed.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fixed.java
@@ -6,7 +6,8 @@
  */
 
 //$Id: Fixed.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fo.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fo.hbm.xml
similarity index 84%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Fo.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fo.hbm.xml
index 0e4f601f7e..bc5ec38dbc 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fo.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fo.hbm.xml
@@ -10,8 +10,8 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 
-	<class name="org.hibernate.test.legacy.Fo" table="foes">
-		<composite-id name="id" class="org.hibernate.test.legacy.FumCompositeID">
+	<class name="org.hibernate.orm.test.legacy.Fo" table="foes">
+		<composite-id name="id" class="org.hibernate.orm.test.legacy.FumCompositeID">
 			<key-property name="string">
 				<column name="string_" length="20"/>
 			</key-property>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fo.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Fo.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fo.java
index e526ad8d30..cf91bba87d 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fo.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Fo.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 
 public final class Fo {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Foo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Foo.java
similarity index 99%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Foo.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Foo.java
index 8633c17304..7db3d55577 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Foo.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Foo.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Foo.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.Calendar;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/FooBar.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FooBar.hbm.xml
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/FooBar.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FooBar.hbm.xml
index 300e885be2..898a2f63a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/FooBar.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FooBar.hbm.xml
@@ -8,7 +8,7 @@
 <!DOCTYPE hibernate-mapping PUBLIC
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping default-lazy="false" package="org.hibernate.test.legacy">
+<hibernate-mapping default-lazy="false" package="org.hibernate.orm.test.legacy">
 
 	<import class="Result"/>
 	<import class="Named"/>
@@ -70,7 +70,7 @@
 		</property>
 		<property name="byte" column="byte_"/>
 		<property name="yesno" type="yes_no"/>
-		<property name="blob" type="org.hibernate.test.legacy.Foo$Struct" column="blobb_"/>
+		<property name="blob" type="org.hibernate.orm.test.legacy.Foo$Struct" column="blobb_"/>
 		<property name="nullBlob" type="serializable"/>
 		<property name="binary" column="bin_"/>
 		<property name="theLocale" access="field" column="`localeayzabc123`"/>
@@ -85,7 +85,7 @@
 			<many-to-one name="glarch"
 				column="g__"
 				cascade="all"
-				class="org.hibernate.test.legacy.Glarch"
+				class="org.hibernate.orm.test.legacy.Glarch"
 				lazy="proxy"
 				outer-join="true"/>
 			<property name="null" column="cmpnt_null_"/>
@@ -122,7 +122,7 @@
 		<join table="foo_dep_table">
 			<key column="fooid"/>
 			<many-to-one name="dependent"
-				class="org.hibernate.test.legacy.Fee"
+				class="org.hibernate.orm.test.legacy.Fee"
 				cascade="all"
 				not-null="true"/>
 		</join>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/FooComponent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FooComponent.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/FooComponent.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FooComponent.java
index 913868116d..9583fa6940 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/FooComponent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FooComponent.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: FooComponent.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.util.Date;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/FooProxy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FooProxy.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/FooProxy.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FooProxy.java
index e4e144bb50..5a5c5a8cc4 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/FooProxy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FooProxy.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 public interface FooProxy {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fum.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fum.hbm.xml
similarity index 88%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Fum.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fum.hbm.xml
index 34e14f057b..e8bc5aee11 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fum.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fum.hbm.xml
@@ -10,7 +10,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 
-	<class name="org.hibernate.test.legacy.Fum" dynamic-update="true">
+	<class name="org.hibernate.orm.test.legacy.Fum" dynamic-update="true">
 		<!--cache-->
 		<composite-id name="id" unsaved-value="any">
 			<meta attribute="fum">fum</meta>
@@ -32,7 +32,7 @@
 				<column name="fr_string_" length="10"/>
 				<column name="fr_short_"/>
 			</key>
-			<one-to-many class="org.hibernate.test.legacy.Fum"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Fum"/>
 		</set>
 		<array name="quxArray">
 			<key>
@@ -40,7 +40,7 @@
 				<column name="fum_sho_"/>
 			</key>
 			<index column="i"/>
-			<one-to-many class="org.hibernate.test.legacy.Qux"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Qux"/>
 		</array>
 		<property name="dupe" 
 			column="short_" 
@@ -55,7 +55,7 @@
 					<column name="fum_sho_"/>
 				</key>
 				<index column="fummapindex" type="string"/>
-				<one-to-many class="org.hibernate.test.legacy.Fum"/>
+				<one-to-many class="org.hibernate.orm.test.legacy.Fum"/>
 			</map>
 			<map name="stringmap" outer-join="true">
 				<key>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fum.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fum.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Fum.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fum.java
index 3fcffd12c8..b990003312 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fum.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fum.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Fum.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.sql.SQLException;
 import java.util.Calendar;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/FumCompositeID.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FumCompositeID.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/FumCompositeID.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FumCompositeID.java
index a704a45b82..775493ae0c 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/FumCompositeID.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/FumCompositeID.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: FumCompositeID.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fumm.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fumm.hbm.xml
similarity index 93%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Fumm.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fumm.hbm.xml
index b19bb19103..542e67934b 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fumm.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fumm.hbm.xml
@@ -10,7 +10,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 
-	<class name="org.hibernate.test.legacy.Fumm">
+	<class name="org.hibernate.orm.test.legacy.Fumm">
 		<composite-id name="id">
 			<key-property name="string">
 				<column name="string_" length="10"/>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fumm.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fumm.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Fumm.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fumm.java
index 68ed26d63d..ccf239b236 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fumm.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fumm.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Fumm.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.util.Locale;
 
 public class Fumm {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Glarch.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Glarch.hbm.xml
similarity index 94%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Glarch.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Glarch.hbm.xml
index b6107a31d5..74745602d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Glarch.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Glarch.hbm.xml
@@ -8,7 +8,7 @@
 <!DOCTYPE hibernate-mapping PUBLIC
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping default-lazy="false" package="org.hibernate.test.legacy">
+<hibernate-mapping default-lazy="false" package="org.hibernate.orm.test.legacy">
 
     <class name="Glarch"
     	table="`glarchez`"
@@ -50,7 +50,7 @@
         <array name="proxyArray" element-class="GlarchProxy">
         	<key column="array_key"/>
         	<index column="array_indecks"/>
-        	<one-to-many class="org.hibernate.test.legacy.Glarch"/>
+        	<one-to-many class="org.hibernate.orm.test.legacy.Glarch"/>
         </array>
         <set name="proxySet">
         	<key column="set_key"/>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Glarch.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Glarch.java
similarity index 99%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Glarch.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Glarch.java
index 2668cda759..7077a27c0d 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Glarch.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Glarch.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Glarch.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.List;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/GlarchProxy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/GlarchProxy.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/GlarchProxy.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/GlarchProxy.java
index f18dce556a..d6e31900b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/GlarchProxy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/GlarchProxy.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Holder.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Holder.hbm.xml
similarity index 80%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Holder.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Holder.hbm.xml
index a25cca856f..8680f4499a 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Holder.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Holder.hbm.xml
@@ -9,7 +9,7 @@
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
-	<class name="org.hibernate.test.legacy.Holder">
+	<class name="org.hibernate.orm.test.legacy.Holder">
 		<id name="id" column="id_" type="string" length="32" unsaved-value="null">
 			<generator class="uuid.hex"/>
 		</id>
@@ -17,16 +17,16 @@
 		<list name="ones">
 			<key column="holder"/>
 			<index column="i"/>
-			<one-to-many class="org.hibernate.test.legacy.One"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.One"/>
 		</list>
 		<array name="fooArray">
 			<key column="holder1"/>
 			<index column="j1"/>
-			<one-to-many class="org.hibernate.test.legacy.Foo"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Foo"/>
 		</array>
 		<set name="foos">
 			<key column="holder2"/>
-			<one-to-many class="org.hibernate.test.legacy.Foo"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Foo"/>
 		</set>
 		<many-to-one name="otherHolder" property-ref="name" cascade="all"/>
 	</class>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Holder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Holder.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Holder.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Holder.java
index 834e2b1773..7df9022f97 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Holder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Holder.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Holder.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.util.List;
 import java.util.Set;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/I.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/I.java
similarity index 94%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/I.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/I.java
index d10f35eea1..54eabf485e 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/I.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/I.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: I.java 7203 2005-06-19 02:01:05Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/IJ.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/IJ.hbm.xml
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/IJ.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/IJ.hbm.xml
index 71181ec321..cd24c577a4 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/IJ.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/IJ.hbm.xml
@@ -9,7 +9,7 @@
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false"
-	package="org.hibernate.test.legacy" 
+	package="org.hibernate.orm.test.legacy"
 	default-access="field">
 
 	<class name="I" discriminator-value="0">
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/IJ2.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/IJ2.hbm.xml
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/IJ2.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/IJ2.hbm.xml
index 24e1caf1bc..8cd97b8cd8 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/IJ2.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/IJ2.hbm.xml
@@ -9,7 +9,7 @@
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false"
-	package="org.hibernate.test.legacy" 
+	package="org.hibernate.orm.test.legacy"
 	default-access="field">
 
 	<class name="I">
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Immutable.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Immutable.hbm.xml
similarity index 87%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Immutable.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Immutable.hbm.xml
index a109cc94c8..67aa8b251e 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Immutable.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Immutable.hbm.xml
@@ -10,7 +10,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 	
-	<class name="org.hibernate.test.legacy.Immutable" table="immut" mutable="false">
+	<class name="org.hibernate.orm.test.legacy.Immutable" table="immut" mutable="false">
 		<!--cache-->
 		<id name="id" column="id_" length="64">
 			<generator class="uuid"/>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Immutable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Immutable.java
similarity index 94%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Immutable.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Immutable.java
index 3d4fe8183e..909e3dcd1c 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Immutable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Immutable.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Immutable.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 public class Immutable {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Inner.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Inner.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Inner.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Inner.java
index 5ee8e64df8..ce5514b94c 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Inner.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Inner.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/InnerKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/InnerKey.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/InnerKey.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/InnerKey.java
index 2501657208..361e6c73d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/InnerKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/InnerKey.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Intervention.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Intervention.java
similarity index 94%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Intervention.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Intervention.java
index 918aa8eaed..65e431e483 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Intervention.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Intervention.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/J.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/J.java
similarity index 92%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/J.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/J.java
index 4fa3e8700d..414c5e4cc7 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/J.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/J.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: J.java 7203 2005-06-19 02:01:05Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Jay.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Jay.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Jay.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Jay.java
index 6ea2aeb9d3..6e153747dc 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Jay.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Jay.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Jay.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/K.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/K.java
similarity index 92%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/K.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/K.java
index d0f4419e16..b107aac51f 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/K.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/K.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: K.java 7203 2005-06-19 02:01:05Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.util.Set;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Location.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Location.hbm.xml
similarity index 93%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Location.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Location.hbm.xml
index df59a9d36b..42a00435a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Location.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Location.hbm.xml
@@ -10,7 +10,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 
-	<class name="org.hibernate.test.legacy.Location">
+	<class name="org.hibernate.orm.test.legacy.Location">
 		<composite-id>
 			<key-property name="streetNumber"/>
 			<key-property name="streetName" length="20"/>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Location.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Location.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Location.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Location.java
index 047c33a046..c754f3a1ed 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Location.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Location.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Location.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.util.Locale;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Lower.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Lower.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Lower.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Lower.java
index 40814615e5..51fe7d32bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Lower.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Lower.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Lower.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.util.List;
 import java.util.Set;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/MainObject.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MainObject.hbm.xml
similarity index 92%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/MainObject.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MainObject.hbm.xml
index cc0f8b4c44..f0c98f91a3 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/MainObject.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MainObject.hbm.xml
@@ -12,7 +12,7 @@
 
 <hibernate-mapping default-lazy="false">
     <class
-        name="org.hibernate.test.legacy.MainObject"
+        name="org.hibernate.orm.test.legacy.MainObject"
         table="mainobject"
         dynamic-update="false"
         dynamic-insert="false"
@@ -31,7 +31,7 @@
 
         <one-to-one
             name="obj2"
-            class="org.hibernate.test.legacy.Object2"
+            class="org.hibernate.orm.test.legacy.Object2"
             cascade="all"
             outer-join="auto"
             constrained="false"
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/MainObject.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MainObject.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/MainObject.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MainObject.java
index 69c75d42ed..8bf39e96d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/MainObject.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MainObject.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Many.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Many.hbm.xml
similarity index 87%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Many.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Many.hbm.xml
index 57ef8003c0..2334a3f32a 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Many.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Many.hbm.xml
@@ -11,12 +11,12 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping default-lazy="false">
-  <class name="org.hibernate.test.legacy.Many" table="many">
+  <class name="org.hibernate.orm.test.legacy.Many" table="many">
     <id name="key" column="many_key">
       <generator class="native" />
     </id>
     <property name="x"/>
-    <many-to-one name="one" column="one_key" class="org.hibernate.test.legacy.One"/>
+    <many-to-one name="one" column="one_key" class="org.hibernate.orm.test.legacy.One"/>
   </class>
 </hibernate-mapping>
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Many.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Many.java
similarity index 94%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Many.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Many.java
index 34b3371503..b1f9aaf490 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Many.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Many.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Many.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 public class Many {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Map.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Map.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Map.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Map.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Marelo.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Marelo.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Marelo.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Marelo.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Medication.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Medication.java
similarity index 53%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Medication.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Medication.java
index c6967cda7a..3fff16fedb 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Medication.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Medication.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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 /**
  * @author hbm2java
  */
-public class Medication extends org.hibernate.test.legacy.Intervention {
+public class Medication extends org.hibernate.orm.test.legacy.Intervention {
 
-   org.hibernate.test.legacy.Drug prescribedDrug;
+   org.hibernate.orm.test.legacy.Drug prescribedDrug;
 
   
-  org.hibernate.test.legacy.Drug getPrescribedDrug() {
+  org.hibernate.orm.test.legacy.Drug getPrescribedDrug() {
     return prescribedDrug;
   }
 
-  void  setPrescribedDrug(org.hibernate.test.legacy.Drug newValue) {
+  void  setPrescribedDrug(org.hibernate.orm.test.legacy.Drug newValue) {
     prescribedDrug = newValue;
   }
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Middle.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Middle.hbm.xml
similarity index 88%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Middle.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Middle.hbm.xml
index 40fa3ef676..0335e99625 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Middle.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Middle.hbm.xml
@@ -11,7 +11,7 @@
 	
 <hibernate-mapping default-lazy="false">
 
-    <class name="org.hibernate.test.legacy.Inner" table="CID_IN">
+    <class name="org.hibernate.orm.test.legacy.Inner" table="CID_IN">
         <composite-id name="id">
             <key-property name="akey" type="string" length="10" column="AKEY"/>
             <key-property name="bkey" type="string" length="10" column="BKEY"/>
@@ -22,7 +22,7 @@
                 <column length="10" name="AKEY"/>
                 <column length="10" name="BKEY"/>
 			</key>
-			<one-to-many class="org.hibernate.test.legacy.Middle"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Middle"/>
 		</bag>
 		<many-to-one name="backOut">
                <column name="BO_AKEY"/>
@@ -33,7 +33,7 @@
  		</many-to-one>	
     </class>
 
-    <class name="org.hibernate.test.legacy.Middle" table="CID_MID">
+    <class name="org.hibernate.orm.test.legacy.Middle" table="CID_MID">
         <composite-id name="id">
             <key-many-to-one name="sup">
                 <column length="10" name="AKEY"/>
@@ -45,7 +45,7 @@
         <property column="BLA" length="10" name="bla" not-null="true" type="string"/>
     </class>
 
-    <class name="org.hibernate.test.legacy.Outer" table="CID_OUT">
+    <class name="org.hibernate.orm.test.legacy.Outer" table="CID_OUT">
         <composite-id name="id">
             <key-many-to-one name="root">
                 <column length="10" name="AKEY"/>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Middle.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Middle.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Middle.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Middle.java
index 813b65b909..e16fd430ae 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Middle.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Middle.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/MiddleKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MiddleKey.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/MiddleKey.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MiddleKey.java
index c39ed22383..e09b689d0e 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/MiddleKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MiddleKey.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Mono.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Mono.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Mono.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Mono.java
index d3f9011e44..c968e29a0f 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Mono.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Mono.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Mono.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.util.Set;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/MoreStuff.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MoreStuff.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/MoreStuff.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MoreStuff.java
index 18d82a7537..22900a38be 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/MoreStuff.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MoreStuff.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: MoreStuff.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.util.Collection;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Multi.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Multi.hbm.xml
similarity index 72%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Multi.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Multi.hbm.xml
index 5db6ac0e61..7ec0e24caa 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Multi.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Multi.hbm.xml
@@ -11,7 +11,7 @@
 <hibernate-mapping default-lazy="false">
 
     <class 
-    	name="org.hibernate.test.legacy.Top" 
+    	name="org.hibernate.orm.test.legacy.Top"
     	table="rootclass" 
     	dynamic-insert="true" 
     	dynamic-update="true"
@@ -26,56 +26,56 @@
         <property name="date" column="date_"/>
         <many-to-one name="top" access="field" column="top_"/>
                 
-        <joined-subclass name="org.hibernate.test.legacy.TrivialClass">
+        <joined-subclass name="org.hibernate.orm.test.legacy.TrivialClass">
         	<key column="tcid"/>
         </joined-subclass>
         
 	    <joined-subclass 
-	    	name="org.hibernate.test.legacy.Lower" 
+	    	name="org.hibernate.orm.test.legacy.Lower"
 	    	table="leafsubclass"
 	    	dynamic-insert="true" 
     		dynamic-update="true">
 	        <key column="id__"/>
 	        <property name="intprop" not-null="true"/>
-	        <one-to-one name="other" class="org.hibernate.test.legacy.Lower"/>
-	        <many-to-one name="another" column="other1" class="org.hibernate.test.legacy.Top"/>
-	        <many-to-one name="yetanother" column="other3" class="org.hibernate.test.legacy.Lower"/>
+	        <one-to-one name="other" class="org.hibernate.orm.test.legacy.Lower"/>
+	        <many-to-one name="another" column="other1" class="org.hibernate.orm.test.legacy.Top"/>
+	        <many-to-one name="yetanother" column="other3" class="org.hibernate.orm.test.legacy.Lower"/>
 	        <property name="foo"/>
 	        <set name="set" lazy="false">
 	        	<key column="parent"/>
-	        	<one-to-many class="org.hibernate.test.legacy.Top"/>
+	        	<one-to-many class="org.hibernate.orm.test.legacy.Top"/>
 	        </set>
 	        <bag name="bag" lazy="true" table="simple_simple">
 	        	<key column="simple1"/>
-	        	<many-to-many column="simple2" class="org.hibernate.test.legacy.Top"/>
+	        	<many-to-many column="simple2" class="org.hibernate.orm.test.legacy.Top"/>
 	        </bag>
 	        <one-to-one name="mypo"/>
 	    </joined-subclass>
 	    
-	    <joined-subclass name="org.hibernate.test.legacy.Multi" table="nonleafsubclass">
+	    <joined-subclass name="org.hibernate.orm.test.legacy.Multi" table="nonleafsubclass">
 	    	<key column="sid" on-delete="cascade"/>
 	        <property name="extraProp" column="dupe"/>
-	        <many-to-one name="other" column="other2" class="org.hibernate.test.legacy.Multi" />
+	        <many-to-one name="other" column="other2" class="org.hibernate.orm.test.legacy.Multi" />
 	        <many-to-one name="po"/>
 	        <property name="derived" formula="upper(dupe)"/>
 	        
-	        <component name="comp" class="org.hibernate.test.legacy.Multi$Component">
+	        <component name="comp" class="org.hibernate.orm.test.legacy.Multi$Component">
 	        	<property name="cal"/>
 	        	<property name="floaty"/>
 	        </component>
 	        
-	        <joined-subclass name="org.hibernate.test.legacy.SubMulti" table="leafsubsubclass">
+	        <joined-subclass name="org.hibernate.orm.test.legacy.SubMulti" table="leafsubsubclass">
 	        	<key column="sid"/>
 	        	<property name="amount" column="dupe"/>
 	        	<bag name="children" lazy="true" inverse="true">
 	        		<key column="parent"/>
-	        		<one-to-many class="org.hibernate.test.legacy.SubMulti"/>
+	        		<one-to-many class="org.hibernate.orm.test.legacy.SubMulti"/>
 	        	</bag>
 	        	<many-to-one name="parent"/>
 				<list name="moreChildren" lazy="true">
 	        		<key column="another_parent"/>
 	        		<index column="list_ind"/>
-	        		<one-to-many class="org.hibernate.test.legacy.SubMulti"/>
+	        		<one-to-many class="org.hibernate.orm.test.legacy.SubMulti"/>
 	        	</list>
 	        </joined-subclass>
 	        
@@ -84,7 +84,7 @@
     </class>
     
     <class 
-    	name="org.hibernate.test.legacy.Po"
+    	name="org.hibernate.orm.test.legacy.Po"
     	dynamic-insert="true">
     	<id type="long" column="id_">
     		<generator class="native"/>
@@ -93,11 +93,11 @@
     	<list name="list" cascade="all">
     		<key column="list_po"/>
     		<index column="i"/>
-    		<one-to-many class="org.hibernate.test.legacy.SubMulti"/>
+    		<one-to-many class="org.hibernate.orm.test.legacy.SubMulti"/>
     	</list>
     	<set name="set" inverse="true" cascade="all">
     		<key column="po"/>
-    		<one-to-many class="org.hibernate.test.legacy.Multi"/>
+    		<one-to-many class="org.hibernate.orm.test.legacy.Multi"/>
     	</set>
     	<many-to-one name="top" column="tl" insert="false" update="false"/>
     	<many-to-one name="lower" column="tl"/>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Multi.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Multi.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Multi.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Multi.java
index ff881c520c..7efde0b0f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Multi.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Multi.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Multi.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.util.Calendar;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/MultiExtends.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MultiExtends.hbm.xml
similarity index 88%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/MultiExtends.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MultiExtends.hbm.xml
index ee237dde11..cd156912df 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/MultiExtends.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/MultiExtends.hbm.xml
@@ -11,8 +11,8 @@
 <hibernate-mapping default-lazy="false">
 
         <joined-subclass 
-        	name="org.hibernate.test.legacy.Mono" 
-        	extends="org.hibernate.test.legacy.Top"
+        	name="org.hibernate.orm.test.legacy.Mono"
+        	extends="org.hibernate.orm.test.legacy.Top"
         	table="mono"
         	dynamic-insert="true" 
     		dynamic-update="true">
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Multiplicity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Multiplicity.java
similarity index 91%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Multiplicity.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Multiplicity.java
index 22aeb44202..6352b2c36f 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Multiplicity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Multiplicity.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Multiplicity.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 
 public class Multiplicity implements Serializable {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Nameable.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Nameable.hbm.xml
similarity index 83%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Nameable.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Nameable.hbm.xml
index 5b3bb403bd..d329a6d543 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Nameable.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Nameable.hbm.xml
@@ -10,13 +10,13 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 
-    <class name="org.hibernate.test.legacy.Nameable">
+    <class name="org.hibernate.orm.test.legacy.Nameable">
         <id name="key" column="key_">
         	<generator class="native"/>
          </id>
         <discriminator column="clazz"/>
         <property name="name"/>
-        <subclass name="org.hibernate.test.legacy.BasicNameable"/>
+        <subclass name="org.hibernate.orm.test.legacy.BasicNameable"/>
     </class>
 
 </hibernate-mapping>
\ No newline at end of file
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Nameable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Nameable.java
similarity index 92%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Nameable.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Nameable.java
index 3c909e0800..5b8e955404 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Nameable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Nameable.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Nameable.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Named.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Named.java
similarity index 90%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Named.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Named.java
index 5840680a47..ab9dc7ddf0 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Named.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Named.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Named.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/NestingComponent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NestingComponent.java
similarity index 92%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/NestingComponent.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NestingComponent.java
index b76e4945c3..d9697af5f8 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/NestingComponent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NestingComponent.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 
 public class NestingComponent implements Serializable {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/NonReflectiveBinderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NonReflectiveBinderTest.java
similarity index 54%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/NonReflectiveBinderTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NonReflectiveBinderTest.java
index 1b61a955f8..58f595b164 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/NonReflectiveBinderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NonReflectiveBinderTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -21,36 +21,34 @@ import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
 
 import org.hibernate.testing.TestForIssue;
-import org.hibernate.testing.junit4.BaseUnitTestCase;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.hibernate.testing.orm.junit.BaseUnitTest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
-public class NonReflectiveBinderTest extends BaseUnitTestCase {
+@BaseUnitTest
+public class NonReflectiveBinderTest {
 	private StandardServiceRegistry ssr;
 	private Metadata metadata;
 
-	public String[] getMappings() {
-		return new String[] { "legacy/Wicked.hbm.xml"};
-	}
-
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 		ssr = new StandardServiceRegistryBuilder()
 				.applySetting( "javax.persistence.validation.mode", "none" )
 				.build();
 		metadata = new MetadataSources( ssr )
-				.addResource( "org/hibernate/test/legacy/Wicked.hbm.xml" )
+				.addResource( "org/hibernate/orm/test/legacy/Wicked.hbm.xml" )
 				.buildMetadata();
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() throws Exception {
 		if ( ssr != null ) {
 			StandardServiceRegistryBuilder.destroy( ssr );
@@ -59,146 +57,143 @@ public class NonReflectiveBinderTest extends BaseUnitTestCase {
 
 	@Test
 	public void testMetaInheritance() {
-		PersistentClass cm = metadata.getEntityBinding( "org.hibernate.test.legacy.Wicked" );
+		PersistentClass cm = metadata.getEntityBinding( "org.hibernate.orm.test.legacy.Wicked" );
 		Map m = cm.getMetaAttributes();
-		assertNotNull(m);
-		assertNotNull(cm.getMetaAttribute("global"));
-		assertNull(cm.getMetaAttribute("globalnoinherit"));
-		
-		MetaAttribute metaAttribute = cm.getMetaAttribute("implements");
-		assertNotNull(metaAttribute);
-		assertEquals("implements", metaAttribute.getName());
-		assertTrue(metaAttribute.isMultiValued());
-		assertEquals(3, metaAttribute.getValues().size());
-		assertEquals("java.lang.Observer",metaAttribute.getValues().get(0));
-		assertEquals("java.lang.Observer",metaAttribute.getValues().get(1));
-		assertEquals("org.foo.BogusVisitor",metaAttribute.getValues().get(2));
+		assertNotNull( m );
+		assertNotNull( cm.getMetaAttribute( "global" ) );
+		assertNull( cm.getMetaAttribute( "globalnoinherit" ) );
+
+		MetaAttribute metaAttribute = cm.getMetaAttribute( "implements" );
+		assertNotNull( metaAttribute );
+		assertThat( metaAttribute.getName(), is( "implements" ) );
+		assertTrue( metaAttribute.isMultiValued() );
+		assertThat( metaAttribute.getValues().size(), is( 3 ) );
+		assertThat( metaAttribute.getValues().get( 0 ), is( "java.lang.Observer" ) );
+		assertThat( metaAttribute.getValues().get( 1 ), is( "java.lang.Observer" ) );
+		assertThat( metaAttribute.getValues().get( 2 ), is( "org.foo.BogusVisitor" ) );
 				
 		/*Property property = cm.getIdentifierProperty();
 		property.getMetaAttribute(null);*/
-		
-		Iterator propertyIterator = cm.getPropertyIterator();
-		while (propertyIterator.hasNext()) {
-			Property element = (Property) propertyIterator.next();
-			System.out.println(element);
+
+		Iterator<Property> propertyIterator = cm.getPropertyIterator();
+		while ( propertyIterator.hasNext() ) {
+			Property element = propertyIterator.next();
 			Map ma = element.getMetaAttributes();
-			assertNotNull(ma);
-			assertNotNull(element.getMetaAttribute("global"));
-			MetaAttribute metaAttribute2 = element.getMetaAttribute("implements");
-			assertNotNull(metaAttribute2);
-			assertNull(element.getMetaAttribute("globalnoinherit"));
-						
+			assertNotNull( ma );
+			assertNotNull( element.getMetaAttribute( "global" ) );
+			MetaAttribute metaAttribute2 = element.getMetaAttribute( "implements" );
+			assertNotNull( metaAttribute2 );
+			assertNull( element.getMetaAttribute( "globalnoinherit" ) );
+
 		}
-		
-		Property element = cm.getProperty("component");
+
+		Property element = cm.getProperty( "component" );
 		Map ma = element.getMetaAttributes();
-		assertNotNull(ma);
-		assertNotNull(element.getMetaAttribute("global"));
-		assertNotNull(element.getMetaAttribute("componentonly"));
-		assertNotNull(element.getMetaAttribute("allcomponent"));
-		assertNull(element.getMetaAttribute("globalnoinherit"));							
-		
-		MetaAttribute compimplements = element.getMetaAttribute("implements");
-		assertNotNull(compimplements);
-		assertEquals(compimplements.getValue(), "AnotherInterface");
-		
-		Property xp = ((Component)element.getValue()).getProperty( "x" );
+		assertNotNull( ma );
+		assertNotNull( element.getMetaAttribute( "global" ) );
+		assertNotNull( element.getMetaAttribute( "componentonly" ) );
+		assertNotNull( element.getMetaAttribute( "allcomponent" ) );
+		assertNull( element.getMetaAttribute( "globalnoinherit" ) );
+
+		MetaAttribute compimplements = element.getMetaAttribute( "implements" );
+		assertNotNull( compimplements );
+		assertThat( compimplements.getValue(), is( "AnotherInterface" ) );
+
+		Property xp = ( (Component) element.getValue() ).getProperty( "x" );
 		MetaAttribute propximplements = xp.getMetaAttribute( "implements" );
-		assertNotNull(propximplements);
-		assertEquals(propximplements.getValue(), "AnotherInterface");
-		
-		
+		assertNotNull( propximplements );
+		assertThat( propximplements.getValue(), is( "AnotherInterface" ) );
+
+
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HBX-718" )
+	@TestForIssue(jiraKey = "HBX-718")
 	public void testNonMutatedInheritance() {
-		PersistentClass cm = metadata.getEntityBinding( "org.hibernate.test.legacy.Wicked" );
+		PersistentClass cm = metadata.getEntityBinding( "org.hibernate.orm.test.legacy.Wicked" );
 		MetaAttribute metaAttribute = cm.getMetaAttribute( "globalmutated" );
-		
-		assertNotNull(metaAttribute);
+
+		assertNotNull( metaAttribute );
 		/*assertEquals( metaAttribute.getValues().size(), 2 );		
 		assertEquals( "top level", metaAttribute.getValues().get(0) );*/
-		assertEquals( "wicked level", metaAttribute.getValue() );
-		
+		assertThat( metaAttribute.getValue(), is( "wicked level" ) );
+
 		Property property = cm.getProperty( "component" );
 		MetaAttribute propertyAttribute = property.getMetaAttribute( "globalmutated" );
-		
-		assertNotNull(propertyAttribute);
+
+		assertNotNull( propertyAttribute );
 		/*assertEquals( propertyAttribute.getValues().size(), 3 );
 		assertEquals( "top level", propertyAttribute.getValues().get(0) );
 		assertEquals( "wicked level", propertyAttribute.getValues().get(1) );*/
-		assertEquals( "monetaryamount level", propertyAttribute.getValue() );
-		
-		org.hibernate.mapping.Component component = (Component)property.getValue();
+		assertThat( propertyAttribute.getValue(), is( "monetaryamount level" ) );
+
+		org.hibernate.mapping.Component component = (Component) property.getValue();
 		property = component.getProperty( "x" );
 		propertyAttribute = property.getMetaAttribute( "globalmutated" );
-		
-		assertNotNull(propertyAttribute);
+
+		assertNotNull( propertyAttribute );
 		/*assertEquals( propertyAttribute.getValues().size(), 4 );
 		assertEquals( "top level", propertyAttribute.getValues().get(0) );
 		assertEquals( "wicked level", propertyAttribute.getValues().get(1) );
 		assertEquals( "monetaryamount level", propertyAttribute.getValues().get(2) );*/
-		assertEquals( "monetaryamount x level", propertyAttribute.getValue() );
-		
+		assertThat( propertyAttribute.getValue(), is( "monetaryamount x level" ) );
+
 		property = cm.getProperty( "sortedEmployee" );
 		propertyAttribute = property.getMetaAttribute( "globalmutated" );
-		
-		assertNotNull(propertyAttribute);
+
+		assertNotNull( propertyAttribute );
 		/*assertEquals( propertyAttribute.getValues().size(), 3 );
 		assertEquals( "top level", propertyAttribute.getValues().get(0) );
 		assertEquals( "wicked level", propertyAttribute.getValues().get(1) );*/
-		assertEquals( "sortedemployee level", propertyAttribute.getValue() );
-		
+		assertThat( propertyAttribute.getValue(), is( "sortedemployee level" ) );
+
 		property = cm.getProperty( "anotherSet" );
 		propertyAttribute = property.getMetaAttribute( "globalmutated" );
-		
-		assertNotNull(propertyAttribute);
+
+		assertNotNull( propertyAttribute );
 		/*assertEquals( propertyAttribute.getValues().size(), 2 );
 		assertEquals( "top level", propertyAttribute.getValues().get(0) );*/
-		assertEquals( "wicked level", propertyAttribute.getValue() );
-				
+		assertThat( propertyAttribute.getValue(), is( "wicked level" ) );
+
 		Bag bag = (Bag) property.getValue();
-		component = (Component)bag.getElement(); 
-		
-		assertEquals(4,component.getMetaAttributes().size());
-		
+		component = (Component) bag.getElement();
+
+		assertThat( component.getMetaAttributes().size(), is( 4 ) );
+
 		metaAttribute = component.getMetaAttribute( "globalmutated" );
 		/*assertEquals( metaAttribute.getValues().size(), 3 );
 		assertEquals( "top level", metaAttribute.getValues().get(0) );
 		assertEquals( "wicked level", metaAttribute.getValues().get(1) );*/
-		assertEquals( "monetaryamount anotherSet composite level", metaAttribute.getValue() );		
-		
+		assertThat( metaAttribute.getValue(), is( "monetaryamount anotherSet composite level" ) );
+
 		property = component.getProperty( "emp" );
 		propertyAttribute = property.getMetaAttribute( "globalmutated" );
-		
-		assertNotNull(propertyAttribute);
+
+		assertNotNull( propertyAttribute );
 		/*assertEquals( propertyAttribute.getValues().size(), 4 );
 		assertEquals( "top level", propertyAttribute.getValues().get(0) );
 		assertEquals( "wicked level", propertyAttribute.getValues().get(1) );
 		assertEquals( "monetaryamount anotherSet composite level", propertyAttribute.getValues().get(2) );*/
-		assertEquals( "monetaryamount anotherSet composite property emp level", propertyAttribute.getValue() );
-		
-		
+		assertThat( propertyAttribute.getValue(), is( "monetaryamount anotherSet composite property emp level" ) );
+
+
 		property = component.getProperty( "empinone" );
 		propertyAttribute = property.getMetaAttribute( "globalmutated" );
-		
-		assertNotNull(propertyAttribute);
+
+		assertNotNull( propertyAttribute );
 		/*assertEquals( propertyAttribute.getValues().size(), 4 );
 		assertEquals( "top level", propertyAttribute.getValues().get(0) );
 		assertEquals( "wicked level", propertyAttribute.getValues().get(1) );
 		assertEquals( "monetaryamount anotherSet composite level", propertyAttribute.getValues().get(2) );*/
-		assertEquals( "monetaryamount anotherSet composite property empinone level", propertyAttribute.getValue() );
-		
-		
+		assertThat( propertyAttribute.getValue(), is( "monetaryamount anotherSet composite property empinone level" ) );
 	}
 
 	@Test
 	public void testComparator() {
-		PersistentClass cm = metadata.getEntityBinding( "org.hibernate.test.legacy.Wicked" );
-		
-		Property property = cm.getProperty("sortedEmployee");
+		PersistentClass cm = metadata.getEntityBinding( "org.hibernate.orm.test.legacy.Wicked" );
+
+		Property property = cm.getProperty( "sortedEmployee" );
 		Collection col = (Collection) property.getValue();
-		assertEquals(col.getComparatorClassName(),"org.hibernate.test.legacy.NonExistingComparator");
+		assertThat( col.getComparatorClassName(), is( "org.hibernate.orm.test.legacy.NonExistingComparator" ) );
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Object2.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Object2.hbm.xml
similarity index 92%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Object2.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Object2.hbm.xml
index 692d33430c..bea075af01 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Object2.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Object2.hbm.xml
@@ -12,7 +12,7 @@
 
 <hibernate-mapping default-lazy="false">
     <class
-        name="org.hibernate.test.legacy.Object2"
+        name="org.hibernate.orm.test.legacy.Object2"
         table="object2"
         dynamic-update="false"
         dynamic-insert="false"
@@ -39,7 +39,7 @@
 
         <one-to-one
             name="belongsToMainObj"
-            class="org.hibernate.test.legacy.MainObject"
+            class="org.hibernate.orm.test.legacy.MainObject"
             cascade="none"
             outer-join="auto"
             constrained="true"
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Object2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Object2.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Object2.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Object2.java
index 7cc911186d..3fac930a84 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Object2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Object2.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/One.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/One.hbm.xml
similarity index 85%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/One.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/One.hbm.xml
index 725a27f497..54c80c32a0 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/One.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/One.hbm.xml
@@ -11,7 +11,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping default-lazy="false">
-	<class name="org.hibernate.test.legacy.One" table="one">
+	<class name="org.hibernate.orm.test.legacy.One" table="one">
 		<id name="key" column="one_key">
 			<generator class="native" />
 		</id>
@@ -19,7 +19,7 @@
 		<property column="one_value" name="value"/>
 		<set name="manies" inverse="true" lazy="true">
 			<key column="one_key"/>
-			<one-to-many class="org.hibernate.test.legacy.Many"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Many"/>
 		</set>
 	</class>
 </hibernate-mapping>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/One.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/One.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/One.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/One.java
index d75da3c47b..8e63cf9a1f 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/One.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/One.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: One.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.util.Set;
 
 public class One {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Outer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Outer.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Outer.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Outer.java
index 15b7385ec4..4faaa53b42 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Outer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Outer.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/OuterKey.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/OuterKey.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/OuterKey.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/OuterKey.java
index 52934eb063..75174991c0 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/OuterKey.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/OuterKey.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Parent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Parent.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Parent.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Parent.java
index bda6999115..d7e10dcf2e 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Parent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Parent.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Parent.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 public class Parent {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/ParentChild.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ParentChild.hbm.xml
similarity index 81%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/ParentChild.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ParentChild.hbm.xml
index 68d58c147a..ec2d26ef47 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/ParentChild.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ParentChild.hbm.xml
@@ -10,7 +10,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 	
-	<class name="org.hibernate.test.legacy.Parent">
+	<class name="org.hibernate.orm.test.legacy.Parent">
 		<id name="id" type="long">
 			<generator class="native"> <!--seqhilo-->
 				<!--<param>foo_seq</param>-->
@@ -25,12 +25,12 @@
         </property>
 	</class>
 	
-	<class name="org.hibernate.test.legacy.Child">
+	<class name="org.hibernate.orm.test.legacy.Child">
 		<id name="id" type="long">
 			<generator class="assigned"/>
 		</id>
 		<property name="x"/>
-		<one-to-one name="parent" class="org.hibernate.test.legacy.Parent" constrained="true" foreign-key="parentfk"/>
+		<one-to-one name="parent" class="org.hibernate.orm.test.legacy.Parent" constrained="true" foreign-key="parentfk"/>
 		<property name="count" column="count_"/>
 	</class>
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Part.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Part.java
similarity index 94%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Part.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Part.java
index 0504c08439..976d12b8a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Part.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Part.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Part.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Party.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Party.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Party.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Party.java
index 9815d62641..84b2dae6c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Party.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Party.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Person.java
similarity index 89%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Person.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Person.java
index 38a5723e43..87abc88d08 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Person.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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 /**
  * @author hbm2java
  */
-public class Person extends org.hibernate.test.legacy.Party {
+public class Person extends org.hibernate.orm.test.legacy.Party {
 
    java.lang.String id;
    java.lang.String givenName;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Po.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Po.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Po.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Po.java
index 12c6c7e0e7..e39924d489 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Po.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Po.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Po.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.util.List;
 import java.util.Set;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Qux.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Qux.hbm.xml
similarity index 79%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Qux.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Qux.hbm.xml
index 7a879c626e..e5e61d979f 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Qux.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Qux.hbm.xml
@@ -10,11 +10,11 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 	
-	<class name="org.hibernate.test.legacy.Qux" table="quux" proxy="org.hibernate.test.legacy.Qux"> <!---->
+	<class name="org.hibernate.orm.test.legacy.Qux" table="quux" proxy="org.hibernate.orm.test.legacy.Qux"> <!---->
 		<id name="key" column="qux_key" unsaved-value="0">
 			<generator class="increment"/>
 		</id>
-		<many-to-one name="foo" class="org.hibernate.test.legacy.Foo">
+		<many-to-one name="foo" class="org.hibernate.orm.test.legacy.Foo">
 			<column name="foo" length="36"/>
 		</many-to-one>
 		<property name="deleted"/>
@@ -25,7 +25,7 @@
 		<property name="stuff"/>
 		<set name="fums" lazy="true">
 			<key column="qux_id"/>
-			<many-to-many class="org.hibernate.test.legacy.Fum">
+			<many-to-many class="org.hibernate.orm.test.legacy.Fum">
 				<column name="fum_string" length="10" not-null="true"/>
 				<column name="fum_short" not-null="true"/>
 			</many-to-many>
@@ -33,7 +33,7 @@
 		<list name="moreFums" lazy="true">
 			<key column="qux_id"/>
 			<index column="posn"/>
-			<one-to-many class="org.hibernate.test.legacy.Fum"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Fum"/>
 		</list>
 		<many-to-one name="holder" column="HOLDER_NAME" property-ref="name"/>
 	</class>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Qux.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Qux.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Qux.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Qux.java
index 5b6b54c566..b5518a5996 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Qux.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Qux.java
@@ -6,8 +6,7 @@
  */
 
 //$Id: Qux.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
-import java.io.Serializable;
+package org.hibernate.orm.test.legacy;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Resource.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Resource.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Resource.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Resource.java
index 651c812964..18ba569044 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Resource.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Resource.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Result.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Result.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Result.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Result.java
index 23f48bb175..f8dea7cca1 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Result.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Result.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/ReverseComparator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ReverseComparator.java
similarity index 94%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/ReverseComparator.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ReverseComparator.java
index d1502fa08e..2f1f619680 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/ReverseComparator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ReverseComparator.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: ReverseComparator.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.util.Comparator;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Role.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Role.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Role.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Role.java
index 55d7b51d37..c636c7de90 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Role.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Role.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Root.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Root.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Root.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Root.java
index 60147f72b1..9d647b567b 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Root.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/RootDetail.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/RootDetail.hbm.xml
similarity index 82%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/RootDetail.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/RootDetail.hbm.xml
index ce91ed1cea..6ce698b790 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/RootDetail.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/RootDetail.hbm.xml
@@ -11,7 +11,7 @@
 	
 <hibernate-mapping default-lazy="false">
 
-	<class name="org.hibernate.test.legacy.Root" table="`root`">
+	<class name="org.hibernate.orm.test.legacy.Root" table="`root`">
 		<meta attribute="foo">foo</meta>
 		<id name="id" column="root_key_column" type="long">
 			<generator class="native"/>
@@ -27,27 +27,27 @@
 		<property name="bigDecimal" column="big_dec" precision="7" scale="3"/>
 		<set name="details" inverse="true" lazy="true" order-by="i asc">
 			<key column="root_key"/>
-			<one-to-many class="org.hibernate.test.legacy.Detail"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Detail"/>
 		</set>
 		<set name="moreDetails" cascade="all" lazy="true" order-by="i desc">
 			<key column="more_root_key"/>
-			<one-to-many class="org.hibernate.test.legacy.Detail"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Detail"/>
 		</set>
 		<set name="incoming" lazy="true" table="mtm">
 			<key foreign-key="AA" column="outgoingabcdef"/>
-			<many-to-many class="org.hibernate.test.legacy.Root" foreign-key="BB">
+			<many-to-many class="org.hibernate.orm.test.legacy.Root" foreign-key="BB">
 				<column name="incomingabcdef" index="IBB"/>
 			</many-to-many>
 		</set>
 		<set name="outgoing" lazy="true" table="mtm" inverse="true">
 			<key column="incomingabcdef"/>
-			<many-to-many class="org.hibernate.test.legacy.Root" column="outgoingabcdef"/>
+			<many-to-many class="org.hibernate.orm.test.legacy.Root" column="outgoingabcdef"/>
 		</set>
 		<many-to-one name="otherRoot"/>
 		<!--query-list name="allDetails" query-ref="all_details"/-->
 	</class>
 	
-	<class name="org.hibernate.test.legacy.Detail">
+	<class name="org.hibernate.orm.test.legacy.Detail">
 		<id column="detail_key_column" type="long">
 			<generator class="native"/>
 		</id>
@@ -63,11 +63,11 @@
 		<!-- <cache timeout="10000" type="readwrite"/> -->
 		<set name="subDetails" lazy="true" cascade="all">
 			<key column="detail_key"/>
-			<one-to-many class="org.hibernate.test.legacy.SubDetail"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.SubDetail"/>
 		</set>
 	</class>
 	
-	<class name="org.hibernate.test.legacy.SubDetail">
+	<class name="org.hibernate.orm.test.legacy.SubDetail">
 		<id column="subdetail_key_col" type="long">
 			<generator class="native">
 				<param name="sequence">fooseq</param>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/S.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/S.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/S.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/S.java
index 5d388e37a2..00b1ec36f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/S.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/S.java
@@ -7,7 +7,7 @@
 
 //$Id: S.java 4599 2004-09-26 05:18:27Z oneovthafew $
 
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 public class S {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Several.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Several.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Several.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Several.java
index 417ee54078..48e9367166 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Several.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Several.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Several.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Simple.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Simple.hbm.xml
similarity index 91%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Simple.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Simple.hbm.xml
index 6b07f0b1fb..5d02fff2a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Simple.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Simple.hbm.xml
@@ -10,7 +10,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 
-    <class name="org.hibernate.test.legacy.Simple" table="SimpleEntity">
+    <class name="org.hibernate.orm.test.legacy.Simple" table="SimpleEntity">
         <id name="id" type="long" column="id_">
             <generator class="assigned"/>
         </id>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Simple.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Simple.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Simple.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Simple.java
index 8b730d5e8e..13d685194e 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Simple.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Simple.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Single.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Single.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Single.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Single.java
index 336885af48..204be36e6b 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Single.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Single.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Single.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/SingleSeveral.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SingleSeveral.hbm.xml
similarity index 87%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/SingleSeveral.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SingleSeveral.hbm.xml
index 680c45174d..1a6c7786f4 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/SingleSeveral.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SingleSeveral.hbm.xml
@@ -12,7 +12,7 @@
 
 <hibernate-mapping default-lazy="false">
 
-	<class name="org.hibernate.test.legacy.Single">
+	<class name="org.hibernate.orm.test.legacy.Single">
 		<composite-id>
 			<key-property name="id" length="32"/>
 			<key-property name="string" length="32" column="string_"/>
@@ -23,11 +23,11 @@
 				<column name="single_id" not-null="true"/>
 				<column name="single_string" not-null="true"/>
 			</key>
-			<one-to-many class="org.hibernate.test.legacy.Several"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Several"/>
 		</bag>
 	</class>
 	
-	<class name="org.hibernate.test.legacy.Several">
+	<class name="org.hibernate.orm.test.legacy.Several">
 		<composite-id unsaved-value="any">
 			<key-property name="id" length="32"/>
 			<key-property name="string" length="32" column="string_"/>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Sortable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Sortable.java
similarity index 94%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Sortable.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Sortable.java
index 348c18afc1..fc7ba0b17d 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Sortable.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Sortable.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 public class Sortable implements Comparable {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/StringComparator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/StringComparator.java
similarity index 93%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/StringComparator.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/StringComparator.java
index 153e6590c7..a4d8db6eab 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/StringComparator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/StringComparator.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.util.Comparator;
 import java.util.Locale;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Stuff.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Stuff.hbm.xml
similarity index 81%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Stuff.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Stuff.hbm.xml
index 6e9f0ea95f..388acfe5e6 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Stuff.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Stuff.hbm.xml
@@ -10,7 +10,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 	
-	<class name="org.hibernate.test.legacy.MoreStuff">
+	<class name="org.hibernate.orm.test.legacy.MoreStuff">
 		<composite-id>
 			<key-property name="intId"/>
 			<key-property name="stringId" length="32"/>
@@ -22,15 +22,15 @@
 				<column name="moreInt" not-null="true"/>
 				<column name="moreString" not-null="true" length="32"/>
 			</key>
-			<one-to-many class="org.hibernate.test.legacy.Stuff"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.Stuff"/>
 		</bag>
 	</class>
 	
-    <class name="org.hibernate.test.legacy.Stuff">
+    <class name="org.hibernate.orm.test.legacy.Stuff">
         <composite-id unsaved-value="any">
             <key-property name="id"/>
-            <key-many-to-one name="foo" class="org.hibernate.test.legacy.Foo"/>
-            <key-many-to-one name="moreStuff" class="org.hibernate.test.legacy.MoreStuff">
+            <key-many-to-one name="foo" class="org.hibernate.orm.test.legacy.Foo"/>
+            <key-many-to-one name="moreStuff" class="org.hibernate.orm.test.legacy.MoreStuff">
             	<column name="moreInt"/>
 				<column name="moreString" length="32"/>
 			</key-many-to-one>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Stuff.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Stuff.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Stuff.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Stuff.java
index 0cb9ac377f..ca48443871 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Stuff.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Stuff.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Stuff.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.util.TimeZone;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/SubComponent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubComponent.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/SubComponent.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubComponent.java
index 074a11ae30..f0d5767318 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/SubComponent.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubComponent.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: SubComponent.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 /**
  * Sub component
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/SubDetail.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubDetail.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/SubDetail.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubDetail.java
index 2f5a7d7b57..6eee38a4b5 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/SubDetail.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubDetail.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: SubDetail.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 public class SubDetail {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/SubMulti.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubMulti.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/SubMulti.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubMulti.java
index 184993d2ae..d4feb99c84 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/SubMulti.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/SubMulti.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: SubMulti.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.util.List;
 
 public class SubMulti extends Multi {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Super.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Super.java
similarity index 91%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Super.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Super.java
index 7f284fe783..ed08aba9c4 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Super.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Super.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 public class Super {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Top.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Top.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Top.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Top.java
index 290342b546..48da82319a 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Top.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Top.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Top.java 5686 2005-02-12 07:27:32Z steveebersole $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 public class Top {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Trivial.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Trivial.java
similarity index 89%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Trivial.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Trivial.java
index 4fa5f25786..9101f0cd44 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Trivial.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Trivial.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Trivial.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/TrivialClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/TrivialClass.java
similarity index 89%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/TrivialClass.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/TrivialClass.java
index d77eb51b2f..5d3e28b1b8 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/TrivialClass.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/TrivialClass.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: TrivialClass.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 public class TrivialClass extends Top {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/TrivialProxy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/TrivialProxy.java
similarity index 89%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/TrivialProxy.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/TrivialProxy.java
index 25bccd410e..88981eb9f3 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/TrivialProxy.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/TrivialProxy.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Up.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Up.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Up.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Up.java
index b142ca1187..4356e4c04c 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Up.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Up.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: Up.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/UpDown.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/UpDown.hbm.xml
similarity index 82%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/UpDown.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/UpDown.hbm.xml
index d4705aa1aa..6bd2281cab 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/UpDown.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/UpDown.hbm.xml
@@ -10,14 +10,14 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 	
 <hibernate-mapping default-lazy="false">
-	<class name="org.hibernate.test.legacy.Up" discriminator-value="null">
+	<class name="org.hibernate.orm.test.legacy.Up" discriminator-value="null">
 		<composite-id>
 			<key-property name="id1"/>
 			<key-property name="id2"/>
 		</composite-id>
 		<discriminator column="value_" type="long" not-null="false" insert="false"/>
 
-		<subclass name="org.hibernate.test.legacy.Down" discriminator-value="not null">
+		<subclass name="org.hibernate.orm.test.legacy.Down" discriminator-value="not null">
 			<property name="value" column="value_" type="long"/>
 		</subclass>
 	</class>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Vetoer.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Vetoer.hbm.xml
similarity index 92%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Vetoer.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Vetoer.hbm.xml
index f62e19d0c1..033a664cc7 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Vetoer.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Vetoer.hbm.xml
@@ -10,7 +10,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 
-    <class name="org.hibernate.test.legacy.Vetoer">
+    <class name="org.hibernate.orm.test.legacy.Vetoer">
         <id name="id" type="string" column="id_" length="32">
             <generator class="uuid.hex"/>
         </id>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Vetoer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Vetoer.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Vetoer.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Vetoer.java
index 3513d3050a..0fc46da0fc 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Vetoer.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Vetoer.java
@@ -6,8 +6,7 @@
  */
 
 //$Id: Vetoer.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
-import java.io.Serializable;
+package org.hibernate.orm.test.legacy;
 
 import org.hibernate.CallbackException;
 import org.hibernate.Session;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/W.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/W.java
similarity index 94%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/W.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/W.java
index 43d1330670..1b54d50459 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/W.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/W.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.util.Set;
 
 public class W {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/WZ.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/WZ.hbm.xml
similarity index 83%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/WZ.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/WZ.hbm.xml
index 9e1c1f89b2..956b4f84e0 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/WZ.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/WZ.hbm.xml
@@ -10,21 +10,21 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 
-	<class name="org.hibernate.test.legacy.Z">
+	<class name="org.hibernate.orm.test.legacy.Z">
 		<id name="id" unsaved-value="0" column="zid">
 			<generator class="increment"/>
 		</id>
 		<many-to-one name="w" 
 			cascade="save-update"
-			class="org.hibernate.test.legacy.W" 
+			class="org.hibernate.orm.test.legacy.W"
 			insert="true" 
 			update="false" 
 			not-null="true"/>
 	</class>
 
-	<class name="org.hibernate.test.legacy.W" 
+	<class name="org.hibernate.orm.test.legacy.W"
 		discriminator-value="0" 
-		proxy="org.hibernate.test.legacy.W">
+		proxy="org.hibernate.orm.test.legacy.W">
 		
 		<id name="id" unsaved-value="0" column="wid">
 			<generator class="increment"/>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Wicked.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Wicked.hbm.xml
similarity index 83%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Wicked.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Wicked.hbm.xml
index c239ceaf0f..4e08f3f115 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Wicked.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Wicked.hbm.xml
@@ -15,7 +15,7 @@
   <meta attribute="globalnoinherit" inherit="false">only visible at top level</meta>
   <meta attribute="globalmutated">top level</meta>
   
-    <class name="org.hibernate.test.legacy.Wicked"
+    <class name="org.hibernate.orm.test.legacy.Wicked"
            table="WICKED"
            schema="HR">
            <meta attribute="implements">java.lang.Observer</meta>
@@ -35,7 +35,7 @@
         <property name="booleanProp"       type="boolean"/>
 	    <property name="objectBooleanProp" type="java.lang.Boolean"/>
   	    <property name="binaryProp"       type="binary"/>
-        <many-to-one name="objectManyToOne"  class="org.hibernate.test.legacy.Employee" column="MANAGER_ID"/>
+        <many-to-one name="objectManyToOne" class="org.hibernate.orm.test.legacy.Employee" column="MANAGER_ID"/>
 		<component name="component" class="net.sf.hibern8ide.test.MonetaryAmount">
 		  <meta attribute="componentonly" inherit="true"/>
 		  <meta attribute="implements">AnotherInterface</meta>
@@ -46,20 +46,20 @@
   		    </property>
 		</component>
 
-		<set name="sortedEmployee" sort="org.hibernate.test.legacy.NonExistingComparator">
+		<set name="sortedEmployee" sort="org.hibernate.orm.test.legacy.NonExistingComparator">
   		     <meta attribute="globalmutated">sortedemployee level</meta>
 			 <key column="attrb_id"/> 
-    	     <many-to-many class="org.hibernate.test.legacy.Employee" column="id"/>
+    	     <many-to-many class="org.hibernate.orm.test.legacy.Employee" column="id"/>
 		</set>
 
         <bag name="anotherSet">
 			 <key column="attrb2_id"/> 			 
-			 <composite-element class="org.hibernate.test.legacy.Employee">
+			 <composite-element class="org.hibernate.orm.test.legacy.Employee">
 				 <meta attribute="globalmutated">monetaryamount anotherSet composite level</meta>
 				  <property name="emp" type="string">
 					  <meta attribute="globalmutated">monetaryamount anotherSet composite property emp level</meta>
 				  </property>
-				  <many-to-one name="empinone" class="org.hibernate.test.legacy.Employee">
+				  <many-to-one name="empinone" class="org.hibernate.orm.test.legacy.Employee">
 					  <meta attribute="globalmutated">monetaryamount anotherSet composite property empinone level</meta>
 				  </many-to-one>
 			 </composite-element>
@@ -67,7 +67,7 @@
 
    </class>
    
-   <class name="org.hibernate.test.legacy.Employee">
+   <class name="org.hibernate.orm.test.legacy.Employee">
         <composite-id class="X">
             <key-property name="comp" type="string"/>
         </composite-id>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/X.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/X.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/X.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/X.java
index d3cf9d0f2e..49eed37b8d 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/X.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/X.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: X.java 4599 2004-09-26 05:18:27Z oneovthafew $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/XY.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/XY.hbm.xml
similarity index 82%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/XY.hbm.xml
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/XY.hbm.xml
index c929ce4c31..21e19408f0 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/XY.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/XY.hbm.xml
@@ -9,7 +9,7 @@
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
-	<class name="org.hibernate.test.legacy.X">
+	<class name="org.hibernate.orm.test.legacy.X">
 		<id name="id" unsaved-value="0" column="xid">
 			<generator class="foreign">
 				<param name="property">y</param>
@@ -18,17 +18,17 @@
 		<one-to-one name="y" constrained="true" cascade="all"/>
 		<bag name="xxs" inverse="true" cascade="all">
 			<key column="x"/>
-			<one-to-many class="org.hibernate.test.legacy.X$XX"/>
+			<one-to-many class="org.hibernate.orm.test.legacy.X$XX"/>
 		</bag>
 	</class>
-	<class name="org.hibernate.test.legacy.Y">
+	<class name="org.hibernate.orm.test.legacy.Y">
 		<id name="id" column="yid">
 			<generator class="increment"/>
 		</id>
 		<property name="x"/>
 		<one-to-one name="theX" cascade="save-update"/>
 	</class>
-	<class name="org.hibernate.test.legacy.X$XX" table="xxx">
+	<class name="org.hibernate.orm.test.legacy.X$XX" table="xxx">
 		<id name="id">
 			<generator class="increment"/>
 		</id>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Y.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Y.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Y.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Y.java
index 857d03d599..94de526c7f 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Y.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Y.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Z.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Z.java
similarity index 93%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Z.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Z.java
index a536d71172..714657cc3c 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Z.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Z.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 
 public class Z {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java
index 3b734244a7..54168556d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java
@@ -37,7 +37,7 @@ import org.hibernate.tool.schema.spi.SourceDescriptor;
 import org.hibernate.tool.schema.spi.TargetDescriptor;
 
 import org.hibernate.testing.TestForIssue;
-import org.hibernate.test.legacy.S;
+import org.hibernate.orm.test.legacy.S;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/FooBarCopy.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/hql/FooBarCopy.hbm.xml
index e09123d41e..7d5a13e818 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/hql/FooBarCopy.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/test/hql/FooBarCopy.hbm.xml
@@ -8,7 +8,7 @@
 <!DOCTYPE hibernate-mapping PUBLIC
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping default-lazy="false" package="org.hibernate.test.legacy">
+<hibernate-mapping default-lazy="false" package="org.hibernate.orm.test.legacy">
 
     <!-- a slightly modified copy of FooBar.hbm.xml from the legacy test package -->
 
@@ -68,7 +68,7 @@
 		</property>
 		<property name="byte" column="byte_"/>
 		<property name="yesno" type="yes_no"/>
-		<property name="blob" type="org.hibernate.test.legacy.Foo$Struct" column="blobb_"/>
+		<property name="blob" type="org.hibernate.orm.test.legacy.Foo$Struct" column="blobb_"/>
 		<property name="nullBlob" type="serializable"/>
 		<property name="binary" column="bin_"/>
 		<property name="theLocale" access="field" column="`localeayzabc123`"/>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/ABCTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/ABCTest.java
deleted file mode 100644
index c0476b89cd..0000000000
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/ABCTest.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
- */
-package org.hibernate.test.legacy;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import org.hibernate.boot.model.naming.Identifier;
-import org.hibernate.mapping.Index;
-import org.hibernate.mapping.Table;
-
-import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-public class ABCTest extends BaseNonConfigCoreFunctionalTestCase {
-	public String[] getMappings() {
-		return new String[] { "legacy/ABC.hbm.xml", "legacy/ABCExtends.hbm.xml" };
-	}
-
-	@Test
-	public void testFormulaAssociation() throws Throwable {
-		Session s = openSession();
-		Transaction t = s.beginTransaction();
-		Long did = Long.valueOf(12);
-		D d = new D( did );
-		s.save(d);
-		A a = new A();
-		a.setName("a");
-		s.save( a );
-		d.setReverse( a );
-		d.inverse = a;
-		t.commit();
-		s.close();
-		
-		s = openSession();
-		t = s.beginTransaction();
-		d = (D) s.get(D.class, did);
-		assertNotNull( d.getReverse() );
-		s.clear();
-		sessionFactory().getCache().evictEntityRegion( D.class );
-		sessionFactory().getCache().evictEntityRegion(A.class);
-		d = (D) s.get(D.class, did);
-		assertNotNull( d.inverse );
-		assertTrue(d.inverse.getName().equals("a"));
-		s.clear();
-		sessionFactory().getCache().evictEntityRegion( D.class );
-		sessionFactory().getCache().evictEntityRegion( A.class );
-		assertTrue( s.createQuery( "from D d join d.reverse r join d.inverse i where i = r" ).list().size()==1 );
-		t.commit();
-		s.close();
-	}
-
-	@Test
-	public void testHigherLevelIndexDefinition() throws Throwable {
-		Table table = metadata().getDatabase().getDefaultNamespace().locateTable( Identifier.toIdentifier( "TA" ) );
-		Iterator<Index> indexItr = table.getIndexIterator();
-		boolean found = false;
-		while ( indexItr.hasNext() ) {
-			final Index index = indexItr.next();
-			if ( "indx_a_name".equals( index.getName() ) ) {
-				found = true;
-				break;
-			}
-		}
-		assertTrue("Unable to locate indx_a_name index", found);
-	}
-
-	@Test
-	public void testSubclassing() throws Exception {
-		Session s = openSession();
-		Transaction t = s.beginTransaction();
-		C1 c1 = new C1();
-		D d = new D();
-		d.setAmount(213.34f);
-		c1.setAddress("foo bar");
-		c1.setCount(23432);
-		c1.setName("c1");
-		c1.setBName("a funny name");
-		c1.setD(d);
-		s.save(c1);
-		d.setId( c1.getId() );
-		s.save(d);
-
-		assertTrue( s.createQuery( "from C2 c where 1=1 or 1=1" ).list().size()==0 );
-
-		t.commit();
-		s.close();
-
-		sessionFactory().getCache().evictEntityRegion( A.class );
-		
-		s = openSession();
-		t = s.beginTransaction();
-		c1 = (C1) s.get( A.class, c1.getId() );
-		assertTrue(
-			c1.getAddress().equals("foo bar") &&
-			(c1.getCount()==23432) &&
-			c1.getName().equals("c1") &&
-			c1.getD().getAmount()>213.3f
-		);
-		assertEquals( "a funny name", c1.getBName() );
-		t.commit();
-		s.close();
-		
-		sessionFactory().getCache().evictEntityRegion( A.class );
-
-		s = openSession();
-		t = s.beginTransaction();
-		c1 = (C1) s.get( B.class, c1.getId() );
-		assertTrue(
-			c1.getAddress().equals("foo bar") &&
-			(c1.getCount()==23432) &&
-			c1.getName().equals("c1") &&
-			c1.getD().getAmount()>213.3f
-		);
-		assertEquals( "a funny name", c1.getBName() );
-		t.commit();
-		s.close();
-
-		s = openSession();
-		t = s.beginTransaction();
-		c1 = (C1) s.load( C1.class, c1.getId() );
-		assertTrue(
-			c1.getAddress().equals("foo bar") &&
-			(c1.getCount()==23432) &&
-			c1.getName().equals("c1") &&
-			c1.getD().getAmount()>213.3f
-		);
-		t.commit();
-		s.close();
-
-		s = openSession();
-		t = s.beginTransaction();
-		List bs = s.createQuery("from B").list();
-		for (int i=0; i<bs.size(); i++) {
-			C1 b = (C1) bs.get(i);
-			s.delete(b);
-			s.delete( b.getD() );
-		}
-		t.commit();
-		s.close();
-	}
-	
-	@Test
-	public void testGetSave() throws Exception {
-		Session s = openSession();
-		Transaction t = s.beginTransaction();
-		assertNull( s.get( D.class, Long.valueOf(1) ) );
-		D d = new D();
-		d.setId( Long.valueOf(1) );
-		s.save(d);
-		s.flush();
-		assertNotNull( s.get( D.class, Long.valueOf(1) ) );
-		s.delete(d);
-		s.flush();
-		t.commit();
-		s.close();
-	}
-
-}
-
diff --git a/hibernate-core/src/test/resources/hibernate.cfg.xml b/hibernate-core/src/test/resources/hibernate.cfg.xml
index 178b516ca2..c257b32383 100644
--- a/hibernate-core/src/test/resources/hibernate.cfg.xml
+++ b/hibernate-core/src/test/resources/hibernate.cfg.xml
@@ -9,6 +9,6 @@
 	<session-factory name="foo">
 		<property name="show_sql">true</property>
 		<mapping resource="org/hibernate/test/legacy/Simple.hbm.xml"/>
-		<class-cache class="org.hibernate.test.legacy.Simple" region="Simple" usage="read-write"/>
+		<class-cache class="org.hibernate.orm.test.legacy.Simple" region="Simple" usage="read-write"/>
 	</session-factory>
 </hibernate-configuration>
\ No newline at end of file
diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/ABCProxyTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/ABCProxyTest.java
index 5f6aa1ad62..da2e03feee 100644
--- a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/ABCProxyTest.java
+++ b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/ABCProxyTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 import java.io.Serializable;
 import java.util.HashMap;
diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/ComponentNotNullTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/ComponentNotNullTest.java
index f10171321c..663b3c4405 100644
--- a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/ComponentNotNullTest.java
+++ b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/ComponentNotNullTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.util.ArrayList;
 
 import org.junit.Test;
diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/CustomSQLTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/CustomSQLTest.java
index 6f4caa2f7c..bb6a49f709 100644
--- a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/CustomSQLTest.java
+++ b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/CustomSQLTest.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: CustomSQLTest.java 10977 2006-12-12 23:28:04Z steve.ebersole@jboss.com $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/FooBarTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/FooBarTest.java
index 06fddc4694..07425bd82c 100644
--- a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/FooBarTest.java
+++ b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/FooBarTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 import java.io.Serializable;
 import java.sql.Connection;
diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/FumTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/FumTest.java
index fe1651dcda..b9de4cf659 100644
--- a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/FumTest.java
+++ b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/FumTest.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: FumTest.java 10977 2006-12-12 23:28:04Z steve.ebersole@jboss.com $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/IJ2Test.java b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/IJ2Test.java
index ef88ff89a0..bb5a3624ae 100644
--- a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/IJ2Test.java
+++ b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/IJ2Test.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 
 import org.junit.Test;
diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/IJTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/IJTest.java
index d3a25cccff..f3b67b07f9 100644
--- a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/IJTest.java
+++ b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/IJTest.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: IJTest.java 10977 2006-12-12 23:28:04Z steve.ebersole@jboss.com $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/LegacyTestCase.java b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/LegacyTestCase.java
index c9897d681c..e1c4c61022 100644
--- a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/LegacyTestCase.java
+++ b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/LegacyTestCase.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 import java.util.List;
 
diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/MapTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/MapTest.java
index 85f42b6a60..c8083662ff 100644
--- a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/MapTest.java
+++ b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/MapTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.List;
diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/MultiTableTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/MultiTableTest.java
index 0283573fe0..73043daa16 100644
--- a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/MultiTableTest.java
+++ b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/MultiTableTest.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: MultiTableTest.java 10977 2006-12-12 23:28:04Z steve.ebersole@jboss.com $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/OneToOneCacheTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/OneToOneCacheTest.java
index c7bf601468..b345148600 100644
--- a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/OneToOneCacheTest.java
+++ b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/OneToOneCacheTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/ParentChildTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/ParentChildTest.java
index 564652d808..2f4b9dfc6b 100644
--- a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/ParentChildTest.java
+++ b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/ParentChildTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 import java.io.Serializable;
 import java.sql.Connection;
diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/QueryByExampleTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/QueryByExampleTest.java
index 50f324a2b8..29f8fff60b 100644
--- a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/QueryByExampleTest.java
+++ b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/QueryByExampleTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 import java.util.List;
 
 import org.junit.Test;
diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/RootDetailTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/RootDetailTest.java
index 931ce1ef55..c8f2b4f528 100644
--- a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/RootDetailTest.java
+++ b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/RootDetailTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 import java.io.Serializable;
 import java.sql.Connection;
diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/SQLFunctionsTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/SQLFunctionsTest.java
index ca1c91809a..035538c691 100644
--- a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/SQLFunctionsTest.java
+++ b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/SQLFunctionsTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/SQLLoaderTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/SQLLoaderTest.java
index 49d586fd1e..50c85fc14f 100644
--- a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/SQLLoaderTest.java
+++ b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/SQLLoaderTest.java
@@ -6,7 +6,7 @@
  */
 
 //$Id: SQLLoaderTest.java 11383 2007-04-02 15:34:02Z steve.ebersole@jboss.com $
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
diff --git a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/StatisticsTest.java b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/StatisticsTest.java
index 2d0e7a9947..f0d21f20af 100644
--- a/hibernate-core/src/test_legacy/org/hibernate/test/legacy/StatisticsTest.java
+++ b/hibernate-core/src/test_legacy/org/hibernate/test/legacy/StatisticsTest.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.test.legacy;
+package org.hibernate.orm.test.legacy;
 
 import org.hibernate.query.Query;
 import org.hibernate.Session;