diff --git a/hibernate-core/src/test/java/org/hibernate/jmx/Entity.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/jmx/Entity.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/jmx/Entity.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/jmx/Entity.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/User.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/metamodel/internal/source/User.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/User.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/metamodel/internal/source/User.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/spi/relational/GeneratedIdColumn.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/metamodel/spi/relational/GeneratedIdColumn.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/metamodel/spi/relational/GeneratedIdColumn.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/metamodel/spi/relational/GeneratedIdColumn.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/subclassProxyInterface/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/subclassProxyInterface/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/subclassProxyInterface/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/subclassProxyInterface/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/abstractembeddedcomponents/cid/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/abstractembeddedcomponents/cid/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/abstractembeddedcomponents/propertyref/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/abstractembeddedcomponents/propertyref/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/any/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/any/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/any/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/any/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/any/Properties.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/any/Properties.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/any/Properties.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/any/Properties.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/array/A.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/array/A.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/array/A.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/array/A.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/batch/DataPoint.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/batch/DataPoint.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/batch/DataPoint.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/batch/DataPoint.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/batchfetch/ProductLine.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/batchfetch/ProductLine.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/batchfetch/ProductLine.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/batchfetch/ProductLine.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/bidi/Auction.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/bidi/Auction.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/bidi/Auction.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/bidi/Auction.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/bidi/Auction2.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/bidi/Auction2.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/bidi/Auction2.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/bidi/Auction2.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/bidir/onetomany/nonindexed/ParentChildInverseOneToMany.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/bidir/onetomany/nonindexed/ParentChildInverseOneToMany.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/bidir/onetomany/nonindexed/ParentChildInverseOneToMany.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/bidir/onetomany/nonindexed/ParentChildInverseOneToMany.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/bidir/onetomany/nonindexed/ParentChildNonInverseOneToMany.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/bidir/onetomany/nonindexed/ParentChildNonInverseOneToMany.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/bidir/onetomany/nonindexed/ParentChildNonInverseOneToMany.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/bidir/onetomany/nonindexed/ParentChildNonInverseOneToMany.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/Bean.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/bytecode/Bean.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/bytecode/Bean.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/bytecode/Bean.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cascade/Child.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cascade/Child.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cascade/Child.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cascade/Child.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cascade/ChildForParentWithAssignedId.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cascade/ChildForParentWithAssignedId.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cascade/ChildForParentWithAssignedId.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cascade/ChildForParentWithAssignedId.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cascade/DeleteOrphanChild.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cascade/DeleteOrphanChild.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cascade/DeleteOrphanChild.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cascade/DeleteOrphanChild.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cascade/Job.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cascade/Job.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cascade/Job.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cascade/Job.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cascade/JobBatch.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cascade/JobBatch.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cascade/JobBatch.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cascade/JobBatch.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cascade/MultiPathCascade.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cascade/MultiPathCascade.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cascade/MultiPathCascade.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cascade/MultiPathCascade.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cascade/Parent.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cascade/Parent.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cascade/Parent.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cascade/Parent.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cascade/ParentWithAssignedId.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cascade/ParentWithAssignedId.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cascade/ParentWithAssignedId.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cascade/ParentWithAssignedId.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cascade/circle/CascadeMergeToChildBeforeParent.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cascade/circle/CascadeMergeToChildBeforeParent.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cascade/circle/CascadeMergeToChildBeforeParent.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cascade/circle/CascadeMergeToChildBeforeParent.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascade.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cascade/circle/MultiPathCircleCascade.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascade.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cascade/circle/MultiPathCircleCascade.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/Cacheable.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cfg/Cacheable.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cfg/Cacheable.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cfg/Cacheable.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/BaseClass.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cfg/cache/BaseClass.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cfg/cache/BaseClass.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cfg/cache/BaseClass.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/Item.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cfg/cache/Item.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cfg/cache/Item.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cfg/cache/Item.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/SubClass.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cfg/cache/SubClass.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cfg/cache/SubClass.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cfg/cache/SubClass.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/cache/hibernate.cfg.xml b/hibernate-core/src/test/resources/org/hibernate/test/cfg/cache/hibernate.cfg.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cfg/cache/hibernate.cfg.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cfg/cache/hibernate.cfg.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/orm-serializable.xml b/hibernate-core/src/test/resources/org/hibernate/test/cfg/orm-serializable.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cfg/orm-serializable.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cfg/orm-serializable.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cid/Customer.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cid/Customer.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cid/Customer.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cid/Customer.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cid/LineItem.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cid/LineItem.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cid/LineItem.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cid/LineItem.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cid/Order.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cid/Order.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cid/Order.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cid/Order.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cid/Product.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cid/Product.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cid/Product.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cid/Product.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cid/PurchaseRecord.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cid/PurchaseRecord.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cid/PurchaseRecord.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cid/PurchaseRecord.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/backref/map/compkey/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/collection/backref/map/compkey/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/collection/backref/map/compkey/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/collection/backref/map/compkey/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/bag/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/collection/bag/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/collection/bag/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/collection/bag/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/UserPermissions.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/collection/custom/basic/UserPermissions.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/UserPermissions.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/collection/custom/basic/UserPermissions.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/Mapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/collection/custom/parameterized/Mapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/Mapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/collection/custom/parameterized/Mapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/idbag/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/collection/idbag/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/collection/idbag/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/collection/idbag/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/list/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/collection/list/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/collection/list/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/collection/list/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/map/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/collection/map/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/collection/map/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/collection/map/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/original/UserPermissions.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/collection/original/UserPermissions.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/collection/original/UserPermissions.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/collection/original/UserPermissions.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/original/Zoo.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/collection/original/Zoo.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/collection/original/Zoo.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/collection/original/Zoo.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/set/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/collection/set/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/collection/set/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/collection/set/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/set/MappingsNonLazy.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/collection/set/MappingsNonLazy.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/collection/set/MappingsNonLazy.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/collection/set/MappingsNonLazy.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/set/User.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/collection/set/User.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/collection/set/User.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/collection/set/User.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/basic/User.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/component/basic/User.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/component/basic/User.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/component/basic/User.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/component/cascading/collection/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/component/cascading/collection/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/component/cascading/toone/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/component/cascading/toone/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/compositeelement/Parent.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/compositeelement/Parent.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/compositeelement/Parent.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/compositeelement/Parent.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/connections/Silly.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/connections/Silly.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/connections/Silly.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/connections/Silly.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/criteria/Animal.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/criteria/Animal.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/criteria/Animal.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/criteria/Animal.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/criteria/Enrolment.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/criteria/Enrolment.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/criteria/Enrolment.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/criteria/Enrolment.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/criteria/Foo.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/criteria/Foo.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/criteria/Foo.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/criteria/Foo.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/criteria/Order.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/criteria/Order.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/criteria/Order.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/criteria/Order.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/criteria/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/criteria/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/criteria/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/criteria/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/criteria/TestObject.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/criteria/TestObject.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/criteria/TestObject.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/criteria/TestObject.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cuk/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cuk/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cuk/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cuk/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cut/Transaction.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cut/Transaction.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cut/Transaction.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cut/Transaction.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/cut/types.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/cut/types.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/cut/types.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/cut/types.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/deletetransient/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/deletetransient/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/deletetransient/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/deletetransient/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/function/Product.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/dialect/function/Product.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/dialect/function/Product.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/dialect/function/Product.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/cache/TestInterSystemsFunctionsClass.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/dialect/functional/cache/TestInterSystemsFunctionsClass.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/dialect/functional/cache/TestInterSystemsFunctionsClass.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/dialect/functional/cache/TestInterSystemsFunctionsClass.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/discriminator/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/discriminator/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/discriminator/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/discriminator/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/discriminator/SimpleInheritance.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/discriminator/SimpleInheritance.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/discriminator/SimpleInheritance.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/discriminator/SimpleInheritance.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/interceptor/Customer.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/dynamicentity/interceptor/Customer.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/dynamicentity/interceptor/Customer.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/dynamicentity/interceptor/Customer.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer/Customer.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/dynamicentity/tuplizer/Customer.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer/Customer.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/dynamicentity/tuplizer/Customer.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/Customer.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/dynamicentity/tuplizer2/Customer.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/Customer.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/dynamicentity/tuplizer2/Customer.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/ecid/Course.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/ecid/Course.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/ecid/Course.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/ecid/Course.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/entitymode/map/basic/ProductLine.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/entitymode/map/basic/ProductLine.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/entitymode/map/basic/ProductLine.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/entitymode/map/basic/ProductLine.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/entitymode/map/subclass/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/entitymode/map/subclass/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/entitymode/map/subclass/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/entitymode/map/subclass/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/entityname/Vehicle.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/entityname/Vehicle.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/entityname/Vehicle.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/entityname/Vehicle.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetMapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetMapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetMapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetMapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetMapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetMapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetMapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetMapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagMapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagMapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagMapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagMapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassMapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassMapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassMapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassMapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetMapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetMapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetMapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetMapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/manytomany/UnidirectionalManyToManyBagMapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/event/collection/association/unidirectional/manytomany/UnidirectionalManyToManyBagMapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/manytomany/UnidirectionalManyToManyBagMapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/event/collection/association/unidirectional/manytomany/UnidirectionalManyToManyBagMapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyBagMapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyBagMapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyBagMapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyBagMapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyListMapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyListMapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyListMapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyListMapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManySetMapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManySetMapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManySetMapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManySetMapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/event/collection/values/ValuesBagMapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/event/collection/values/ValuesBagMapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/event/collection/values/ValuesBagMapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/event/collection/values/ValuesBagMapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/exception/Group.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/exception/Group.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/exception/Group.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/exception/Group.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/exception/User.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/exception/User.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/exception/User.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/exception/User.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/Customer.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/extendshbm/Customer.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/extendshbm/Customer.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/extendshbm/Customer.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/Employee.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/extendshbm/Employee.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/extendshbm/Employee.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/extendshbm/Employee.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/extendshbm/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/extendshbm/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/extendshbm/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/allinone.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/extendshbm/allinone.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/extendshbm/allinone.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/extendshbm/allinone.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/allseparateinone.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/extendshbm/allseparateinone.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/extendshbm/allseparateinone.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/extendshbm/allseparateinone.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/entitynames.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/extendshbm/entitynames.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/extendshbm/entitynames.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/extendshbm/entitynames.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/packageentitynames.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/extendshbm/packageentitynames.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/extendshbm/packageentitynames.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/extendshbm/packageentitynames.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/extendshbm/unionsubclass.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/extendshbm/unionsubclass.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/extendshbm/unionsubclass.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/extendshbm/unionsubclass.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/extralazy/UserGroup.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/extralazy/UserGroup.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/extralazy/UserGroup.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/extralazy/UserGroup.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/fetchprofiles/join/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/fetchprofiles/join/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/filter/Category.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/filter/Category.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/filter/Category.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/filter/Category.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/filter/Department.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/filter/Department.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/filter/Department.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/filter/Department.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/filter/LineItem.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/filter/LineItem.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/filter/LineItem.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/filter/LineItem.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/filter/Order.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/filter/Order.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/filter/Order.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/filter/Order.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/filter/Product.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/filter/Product.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/filter/Product.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/filter/Product.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/filter/Salesperson.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/filter/Salesperson.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/filter/Salesperson.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/filter/Salesperson.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/filter/defs.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/filter/defs.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/filter/defs.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/filter/defs.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/filter/hql/Basic.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/filter/hql/Basic.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/filter/hql/Basic.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/filter/hql/Basic.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/filter/hql/Joined.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/filter/hql/Joined.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/filter/hql/Joined.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/filter/hql/Joined.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/filter/hql/filter-defs.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/filter/hql/filter-defs.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/filter/hql/filter-defs.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/filter/hql/filter-defs.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/formulajoin/Master.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/formulajoin/Master.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/formulajoin/Master.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/formulajoin/Master.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/generated/ComponentOwner.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/generated/ComponentOwner.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/generated/ComponentOwner.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/generated/ComponentOwner.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/generated/GeneratedPropertyEntity.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/generated/GeneratedPropertyEntity.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/generated/GeneratedPropertyEntity.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/generated/GeneratedPropertyEntity.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/generated/MSSQLGeneratedPropertyEntity.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/generated/MSSQLGeneratedPropertyEntity.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/generated/MSSQLGeneratedPropertyEntity.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/generated/MSSQLGeneratedPropertyEntity.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MyEntity.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/generatedkeys/identity/MyEntity.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MyEntity.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/generatedkeys/identity/MyEntity.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/select/MyEntity.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/generatedkeys/select/MyEntity.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/generatedkeys/select/MyEntity.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/generatedkeys/select/MyEntity.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/seqidentity/MyEntity.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/generatedkeys/seqidentity/MyEntity.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/generatedkeys/seqidentity/MyEntity.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/generatedkeys/seqidentity/MyEntity.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/Animal.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/hql/Animal.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/hql/Animal.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/hql/Animal.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/BooleanLiteralEntity.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/hql/BooleanLiteralEntity.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/hql/BooleanLiteralEntity.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/hql/BooleanLiteralEntity.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/ComponentContainer.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/hql/ComponentContainer.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/hql/ComponentContainer.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/hql/ComponentContainer.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/CompositeIdEntity.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/hql/CompositeIdEntity.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/hql/CompositeIdEntity.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/hql/CompositeIdEntity.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/CrazyIdFieldNames.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/hql/CrazyIdFieldNames.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/hql/CrazyIdFieldNames.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/hql/CrazyIdFieldNames.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/EntityWithCrazyCompositeKey.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/hql/EntityWithCrazyCompositeKey.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/hql/EntityWithCrazyCompositeKey.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/hql/EntityWithCrazyCompositeKey.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/FooBarCopy.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/hql/FooBarCopy.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/hql/FooBarCopy.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/hql/FooBarCopy.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/FunctionNamesAsColumns.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/hql/FunctionNamesAsColumns.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/hql/FunctionNamesAsColumns.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/hql/FunctionNamesAsColumns.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/Image.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/hql/Image.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/hql/Image.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/hql/Image.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/KeyManyToOneEntity.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/hql/KeyManyToOneEntity.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/hql/KeyManyToOneEntity.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/hql/KeyManyToOneEntity.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/SimpleEntityWithAssociation.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/hql/SimpleEntityWithAssociation.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/hql/SimpleEntityWithAssociation.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/hql/SimpleEntityWithAssociation.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/VariousKeywordPropertyEntity.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/hql/VariousKeywordPropertyEntity.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/hql/VariousKeywordPropertyEntity.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/hql/VariousKeywordPropertyEntity.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/Vehicle.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/hql/Vehicle.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/hql/Vehicle.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/hql/Vehicle.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/Versions.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/hql/Versions.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/hql/Versions.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/hql/Versions.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/id/Car.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/id/Car.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/id/Car.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/id/Car.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/id/Plane.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/id/Plane.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/id/Plane.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/id/Plane.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/id/Product.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/id/Product.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/id/Product.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/id/Product.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/id/Radio.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/id/Radio.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/id/Radio.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/id/Radio.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/id/uuid/sqlrep/Node.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/id/uuid/sqlrep/Node.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/id/uuid/sqlrep/Node.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/id/uuid/sqlrep/Node.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/id/uuid/sqlrep/Node2.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/id/uuid/sqlrep/Node2.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/id/uuid/sqlrep/Node2.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/id/uuid/sqlrep/Node2.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/id/uuid/strategy/Node.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/id/uuid/strategy/Node.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/id/uuid/strategy/Node.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/id/uuid/strategy/Node.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/idbag/UserGroup.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/idbag/UserGroup.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/idbag/UserGroup.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/idbag/UserGroup.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/idclass/Customer.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/idclass/Customer.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/idclass/Customer.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/idclass/Customer.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/idgen/biginteger/increment/Mapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/idgen/biginteger/increment/Mapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/idgen/biginteger/increment/Mapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/idgen/biginteger/increment/Mapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/idgen/biginteger/sequence/Mapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/idgen/biginteger/sequence/Mapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/idgen/biginteger/sequence/Mapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/idgen/biginteger/sequence/Mapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/Basic.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/idgen/enhanced/forcedtable/Basic.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/Basic.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/idgen/enhanced/forcedtable/Basic.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/HiLo.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/idgen/enhanced/forcedtable/HiLo.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/HiLo.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/idgen/enhanced/forcedtable/HiLo.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/Pooled.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/idgen/enhanced/forcedtable/Pooled.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/Pooled.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/idgen/enhanced/forcedtable/Pooled.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/Basic.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/idgen/enhanced/sequence/Basic.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/Basic.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/idgen/enhanced/sequence/Basic.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/Dedicated.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/idgen/enhanced/sequence/Dedicated.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/Dedicated.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/idgen/enhanced/sequence/Dedicated.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/HiLo.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/idgen/enhanced/sequence/HiLo.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/HiLo.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/idgen/enhanced/sequence/HiLo.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/Pooled.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/idgen/enhanced/sequence/Pooled.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/Pooled.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/idgen/enhanced/sequence/Pooled.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/Basic.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/idgen/enhanced/table/Basic.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/Basic.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/idgen/enhanced/table/Basic.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/HiLo.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/idgen/enhanced/table/HiLo.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/HiLo.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/idgen/enhanced/table/HiLo.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/Pooled.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/idgen/enhanced/table/Pooled.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/Pooled.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/idgen/enhanced/table/Pooled.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/idprops/Mapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/idprops/Mapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/idprops/Mapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/idprops/Mapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/immutable/ContractVariation.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/immutable/ContractVariation.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/immutable/ContractVariation.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/immutable/ContractVariation.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariation.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariation.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariation.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariation.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationOneToManyJoin.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationOneToManyJoin.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationOneToManyJoin.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationOneToManyJoin.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersioned.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersioned.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersioned.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersioned.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersionedOneToManyJoin.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersionedOneToManyJoin.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersionedOneToManyJoin.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersionedOneToManyJoin.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariation.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariation.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariation.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariation.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationOneToManyJoin.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationOneToManyJoin.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationOneToManyJoin.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationOneToManyJoin.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationUnidir.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationUnidir.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationUnidir.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationUnidir.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersioned.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersioned.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersioned.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersioned.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersionedOneToManyJoin.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersionedOneToManyJoin.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersionedOneToManyJoin.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersionedOneToManyJoin.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/inheritance/SimpleInheritance.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/inheritance/SimpleInheritance.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/inheritance/SimpleInheritance.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/inheritance/SimpleInheritance.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/insertordering/Mapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/insertordering/Mapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/insertordering/Mapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/insertordering/Mapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/instrument/domain/Documents.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/instrument/domain/Documents.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/instrument/domain/Documents.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/instrument/domain/Documents.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/instrument/domain/Problematic.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/instrument/domain/Problematic.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/instrument/domain/Problematic.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/instrument/domain/Problematic.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/instrument/domain/SharedPKOneToOne.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/instrument/domain/SharedPKOneToOne.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/instrument/domain/SharedPKOneToOne.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/instrument/domain/SharedPKOneToOne.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/interceptor/Image.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/interceptor/Image.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/interceptor/Image.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/interceptor/Image.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/interceptor/User.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/interceptor/User.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/interceptor/User.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/interceptor/User.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Item.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/interfaceproxy/Item.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Item.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/interfaceproxy/Item.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/iterate/Item.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/iterate/Item.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/iterate/Item.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/iterate/Item.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jdbc/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/jdbc/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/jdbc/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/jdbc/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/join/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/join/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/join/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/join/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/join/Thing.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/join/Thing.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/join/Thing.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/join/Thing.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/joinedsubclass/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/joinedsubclass/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinfetch/ItemBid.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/joinfetch/ItemBid.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/joinfetch/ItemBid.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/joinfetch/ItemBid.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinfetch/UserGroup.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/joinfetch/UserGroup.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/joinfetch/UserGroup.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/joinfetch/UserGroup.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/Item.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/jpa/Item.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/jpa/Item.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/jpa/Item.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/MyEntity.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/jpa/MyEntity.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/jpa/MyEntity.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/jpa/MyEntity.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/Part.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/jpa/Part.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/jpa/Part.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/jpa/Part.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/ParentChild.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/jpa/cascade/ParentChild.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/ParentChild.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/jpa/cascade/ParentChild.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/fetch/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/jpa/fetch/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/jpa/fetch/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/jpa/fetch/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/User.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/jpa/naturalid/User.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/User.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/jpa/naturalid/User.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerMapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/keymanytoone/bidir/component/EagerMapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerMapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/keymanytoone/bidir/component/EagerMapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/LazyMapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/keymanytoone/bidir/component/LazyMapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/LazyMapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/keymanytoone/bidir/component/LazyMapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/Mapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/keymanytoone/bidir/embedded/Mapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/Mapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/keymanytoone/bidir/embedded/Mapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/lazycache/Documents.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/lazycache/Documents.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/lazycache/Documents.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/lazycache/Documents.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/lazyonetoone/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/lazyonetoone/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/ABC.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/ABC.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/ABC.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/ABC.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/ABCExtends.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/ABCExtends.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/ABCExtends.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/ABCExtends.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/ABCProxy.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/ABCProxy.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/ABCProxy.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/ABCProxy.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/AltSimple.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/AltSimple.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/AltSimple.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/AltSimple.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Baz.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Baz.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Baz.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Baz.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Blobber.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Blobber.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Blobber.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Blobber.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Broken.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Broken.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Broken.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Broken.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Category.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Category.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Category.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Category.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Circular.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Circular.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Circular.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Circular.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Commento.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/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/resources/org/hibernate/test/legacy/Commento.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentNotNullMaster.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/ComponentNotNullMaster.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentNotNullMaster.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/ComponentNotNullMaster.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Componentizable.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Componentizable.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Componentizable.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Componentizable.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/CompositeIdId.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/CompositeIdId.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/CompositeIdId.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/CompositeIdId.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Container.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Container.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Container.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Container.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Custom.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Custom.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Custom.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Custom.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/CustomSQL.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/CustomSQL.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/CustomSQL.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/CustomSQL.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Eye.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Eye.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Eye.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Eye.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fee.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Fee.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Fee.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Fee.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fo.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Fo.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Fo.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Fo.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/FooBar.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/FooBar.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/FooBar.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/FooBar.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fum.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Fum.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Fum.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Fum.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Fumm.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Fumm.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Fumm.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Fumm.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Glarch.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Glarch.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Glarch.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Glarch.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Holder.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Holder.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Holder.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Holder.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/IJ.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/IJ.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/IJ.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/IJ.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/IJ2.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/IJ2.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/IJ2.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/IJ2.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Immutable.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Immutable.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Immutable.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Immutable.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Location.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Location.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Location.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Location.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/MainObject.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/MainObject.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/MainObject.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/MainObject.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Many.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Many.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Many.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Many.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Map.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/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/resources/org/hibernate/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/resources/org/hibernate/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/resources/org/hibernate/test/legacy/Marelo.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/MasterDetail.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/MasterDetail.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/MasterDetail.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/MasterDetail.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Middle.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Middle.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Middle.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Middle.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Multi.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Multi.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Multi.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Multi.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/MultiExtends.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/MultiExtends.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/MultiExtends.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/MultiExtends.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Nameable.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Nameable.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Nameable.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Nameable.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Object2.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Object2.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Object2.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Object2.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/One.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/One.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/One.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/One.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/ParentChild.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/ParentChild.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/ParentChild.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/ParentChild.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Qux.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Qux.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Qux.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Qux.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Simple.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Simple.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Simple.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Simple.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/SingleSeveral.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/SingleSeveral.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/SingleSeveral.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/SingleSeveral.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Stuff.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Stuff.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Stuff.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Stuff.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/UpDown.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/UpDown.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/UpDown.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/UpDown.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Vetoer.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Vetoer.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Vetoer.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Vetoer.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/WZ.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/WZ.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/WZ.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/WZ.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Wicked.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/Wicked.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/Wicked.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/Wicked.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/XY.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/legacy/XY.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/legacy/XY.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/legacy/XY.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/lob/ImageMappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/lob/ImageMappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/lob/ImageMappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/lob/ImageMappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/lob/LobMappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/lob/LobMappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/lob/LobMappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/lob/LobMappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/lob/MaterializedBlobMappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/lob/MaterializedBlobMappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/lob/MaterializedBlobMappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/lob/MaterializedBlobMappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/lob/MaterializedClobMappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/lob/MaterializedClobMappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/lob/MaterializedClobMappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/lob/MaterializedClobMappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/lob/SerializableMappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/lob/SerializableMappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/lob/SerializableMappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/lob/SerializableMappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/lob/TextMappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/lob/TextMappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/lob/TextMappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/lob/TextMappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/manytomany/UserGroup.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/manytomany/UserGroup.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/manytomany/UserGroup.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/manytomany/UserGroup.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/manytomany/batchload/UserGroupBatchLoad.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/manytomany/batchload/UserGroupBatchLoad.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/manytomany/batchload/UserGroupBatchLoad.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/manytomany/batchload/UserGroupBatchLoad.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/manytomany/ordered/UserGroup.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/manytomany/ordered/UserGroup.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/manytomany/ordered/UserGroup.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/manytomany/ordered/UserGroup.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/manytomanyassociationclass/compositeid/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/manytomanyassociationclass/compositeid/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/map/UserGroup.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/map/UserGroup.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/map/UserGroup.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/map/UserGroup.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapcompelem/ProductPart.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/mapcompelem/ProductPart.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/mapcompelem/ProductPart.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/mapcompelem/ProductPart.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapelemformula/UserGroup.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/mapelemformula/UserGroup.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/mapelemformula/UserGroup.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/mapelemformula/UserGroup.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/mappingexception/InvalidMapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/mappingexception/InvalidMapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/mappingexception/InvalidMapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/mappingexception/InvalidMapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/mappingexception/User.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/mappingexception/User.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/mappingexception/User.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/mappingexception/User.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/mixed/Item.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/mixed/Item.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/mixed/Item.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/mixed/Item.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/Customers.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/namingstrategy/Customers.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/namingstrategy/Customers.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/namingstrategy/Customers.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/naturalid/immutable/ParentChildWithManyToOne.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/naturalid/immutable/ParentChildWithManyToOne.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/naturalid/immutable/ParentChildWithManyToOne.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/naturalid/immutable/ParentChildWithManyToOne.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/naturalid/immutable/User.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/naturalid/immutable/User.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/naturalid/immutable/User.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/naturalid/immutable/User.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/naturalid/mutable/User.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/naturalid/mutable/User.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/naturalid/mutable/User.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/naturalid/mutable/User.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Competition.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/nonflushedchanges/Competition.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Competition.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/nonflushedchanges/Competition.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Employer.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/nonflushedchanges/Employer.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Employer.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/nonflushedchanges/Employer.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Node.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/nonflushedchanges/Node.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Node.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/nonflushedchanges/Node.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/OneToOne.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/nonflushedchanges/OneToOne.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/OneToOne.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/nonflushedchanges/OneToOne.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/OptLockEntity.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/nonflushedchanges/OptLockEntity.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/OptLockEntity.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/nonflushedchanges/OptLockEntity.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/ondelete/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/ondelete/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/ondelete/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/ondelete/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/onetomany/Node.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/onetomany/Node.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/onetomany/Node.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/onetomany/Node.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/onetomany/Parent.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/onetomany/Parent.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/onetomany/Parent.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/onetomany/Parent.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/onetomany/VersionedNode.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/onetomany/VersionedNode.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/onetomany/VersionedNode.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/onetomany/VersionedNode.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/onetoone/basic/Mapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/onetoone/basic/Mapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/onetoone/basic/Mapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/onetoone/basic/Mapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/onetoone/formula/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/onetoone/formula/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/onetoone/formula/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/onetoone/formula/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/onetoone/joined/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/onetoone/joined/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/onetoone/joined/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/onetoone/joined/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/onetoone/link/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/onetoone/link/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/onetoone/link/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/onetoone/link/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/onetoone/nopojo/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/onetoone/nopojo/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/onetoone/nopojo/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/onetoone/nopojo/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/onetoone/optional/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/onetoone/optional/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/onetoone/optional/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/onetoone/optional/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/onetoone/singletable/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/onetoone/singletable/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/onetoone/singletable/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/onetoone/singletable/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/ops/Competition.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/ops/Competition.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/ops/Competition.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/ops/Competition.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/ops/Employer.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/ops/Employer.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/ops/Employer.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/ops/Employer.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/ops/Node.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/ops/Node.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/ops/Node.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/ops/Node.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/ops/OneToOne.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/ops/OneToOne.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/ops/OneToOne.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/ops/OneToOne.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/ops/OptLockEntity.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/ops/OptLockEntity.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/ops/OptLockEntity.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/ops/OptLockEntity.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/ops/SimpleEntity.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/ops/SimpleEntity.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/ops/SimpleEntity.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/ops/SimpleEntity.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/optlock/Document.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/optlock/Document.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/optlock/Document.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/optlock/Document.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/ordered/Search.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/ordered/Search.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/ordered/Search.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/ordered/Search.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/orphan/Mail.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/orphan/Mail.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/orphan/Mail.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/orphan/Mail.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/orphan/Product.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/orphan/Product.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/orphan/Product.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/orphan/Product.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/orphan/User.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/orphan/User.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/orphan/User.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/orphan/User.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/bidirectional/Mapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/orphan/one2one/fk/bidirectional/Mapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/bidirectional/Mapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/orphan/one2one/fk/bidirectional/Mapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/composite/Mapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/orphan/one2one/fk/composite/Mapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/composite/Mapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/orphan/one2one/fk/composite/Mapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/Mapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/Mapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/Mapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/Mapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/Mapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/Mapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/Mapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/Mapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/pk/bidirectional/Mapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/orphan/one2one/pk/bidirectional/Mapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/pk/bidirectional/Mapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/orphan/one2one/pk/bidirectional/Mapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/pk/unidirectional/Mapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/orphan/one2one/pk/unidirectional/Mapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/pk/unidirectional/Mapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/orphan/one2one/pk/unidirectional/Mapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/pagination/DataPoint.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/pagination/DataPoint.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/pagination/DataPoint.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/pagination/DataPoint.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/pagination/EntryTag.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/pagination/EntryTag.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/pagination/EntryTag.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/pagination/EntryTag.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/propertyref/Mapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/propertyref/Mapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/propertyref/Mapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/propertyref/Mapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/propertyref/basic/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/propertyref/basic/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/propertyref/basic/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/propertyref/basic/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/propertyref/cachedcollections/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/propertyref/cachedcollections/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/propertyref/cachedcollections/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/propertyref/cachedcollections/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/propertyref/component/complete/Mapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/propertyref/component/complete/Mapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/propertyref/component/complete/Mapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/propertyref/component/complete/Mapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/propertyref/component/partial/Mapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/propertyref/component/partial/Mapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/propertyref/component/partial/Mapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/propertyref/component/partial/Mapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/propertyref/inheritence/discrim/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/propertyref/inheritence/discrim/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/joined/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/propertyref/inheritence/joined/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/joined/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/propertyref/inheritence/joined/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/union/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/propertyref/inheritence/union/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/union/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/propertyref/inheritence/union/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/proxy/DataPoint.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/proxy/DataPoint.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/proxy/DataPoint.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/proxy/DataPoint.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/querycache/Enrolment.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/querycache/Enrolment.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/querycache/Enrolment.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/querycache/Enrolment.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/querycache/Item.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/querycache/Item.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/querycache/Item.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/querycache/Item.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/queryplan/Joined.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/queryplan/Joined.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/queryplan/Joined.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/queryplan/Joined.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/queryplan/filter-defs.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/queryplan/filter-defs.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/queryplan/filter-defs.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/queryplan/filter-defs.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/readonly/DataPoint.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/readonly/DataPoint.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/readonly/DataPoint.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/readonly/DataPoint.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/readonly/Enrolment.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/readonly/Enrolment.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/readonly/Enrolment.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/readonly/Enrolment.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/readonly/TextHolder.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/readonly/TextHolder.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/readonly/TextHolder.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/readonly/TextHolder.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/readonly/VersionedNode.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/readonly/VersionedNode.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/readonly/VersionedNode.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/readonly/VersionedNode.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/reattachment/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/reattachment/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/reattachment/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/reattachment/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/resulttransformer/Contract.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/resulttransformer/Contract.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/resulttransformer/Contract.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/resulttransformer/Contract.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/rowid/Point.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/rowid/Point.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/rowid/Point.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/rowid/Point.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/1_Version.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/schemaupdate/1_Version.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/1_Version.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/schemaupdate/1_Version.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/2_Version.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/schemaupdate/2_Version.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/2_Version.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/schemaupdate/2_Version.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/mapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/schemaupdate/mapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/schemaupdate/mapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/schemaupdate/mapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/sorted/Search.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/sorted/Search.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/sorted/Search.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/sorted/Search.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/sql/check/oracle-mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/sql/check/oracle-mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/sql/check/oracle-mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/sql/check/oracle-mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/mysql/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/sql/hand/custom/mysql/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/mysql/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/sql/hand/custom/mysql/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/oracle/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/sql/hand/custom/oracle/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/oracle/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/sql/hand/custom/oracle/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/oracle/StoredProcedures.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/sql/hand/custom/oracle/StoredProcedures.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/oracle/StoredProcedures.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/sql/hand/custom/oracle/StoredProcedures.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/sqlserver/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/sql/hand/custom/sqlserver/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/sqlserver/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/sql/hand/custom/sqlserver/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/sybase/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/sql/hand/custom/sybase/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/sybase/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/sql/hand/custom/sybase/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/sql/hand/identity/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/sql/hand/identity/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/sql/hand/identity/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/sql/hand/identity/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/sql/hand/quotedidentifiers/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/sql/hand/quotedidentifiers/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/stateless/Contact.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/stateless/Contact.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/stateless/Contact.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/stateless/Contact.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/stateless/Document.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/stateless/Document.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/stateless/Document.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/stateless/Document.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/stateless/fetching/Mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/stateless/fetching/Mappings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/stateless/fetching/Mappings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/stateless/fetching/Mappings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/stats/Continent.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/stats/Continent.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/stats/Continent.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/stats/Continent.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/stats/Continent2.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/stats/Continent2.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/stats/Continent2.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/stats/Continent2.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/subclassfilter/discrim-subclass.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/subclassfilter/discrim-subclass.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/subclassfilter/discrim-subclass.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/subclassfilter/discrim-subclass.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/subclassfilter/joined-subclass.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/subclassfilter/joined-subclass.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/subclassfilter/joined-subclass.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/subclassfilter/joined-subclass.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/subclassfilter/union-subclass.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/subclassfilter/union-subclass.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/subclassfilter/union-subclass.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/subclassfilter/union-subclass.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/subselect/Beings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/subselect/Beings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/subselect/Beings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/subselect/Beings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/ParentChild.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/subselectfetch/ParentChild.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/subselectfetch/ParentChild.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/subselectfetch/ParentChild.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/ternary/Ternary.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/ternary/Ternary.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/ternary/Ternary.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/ternary/Ternary.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/timestamp/User.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/timestamp/User.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/timestamp/User.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/timestamp/User.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/tm/Item.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/tm/Item.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/tm/Item.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/tm/Item.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/Customer.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/typedmanytoone/Customer.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/Customer.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/typedmanytoone/Customer.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/typedonetoone/Customer.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/typedonetoone/Customer.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/typedonetoone/Customer.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/typedonetoone/Customer.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/typeoverride/Entity.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/typeoverride/Entity.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/typeoverride/Entity.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/typeoverride/Entity.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/typeparameters/Typedef.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/typeparameters/Typedef.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/typeparameters/Typedef.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/typeparameters/Typedef.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/typeparameters/Widget.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/typeparameters/Widget.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/typeparameters/Widget.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/typeparameters/Widget.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/unconstrained/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/unconstrained/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/unconstrained/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/unconstrained/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/unidir/ParentChild.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/unidir/ParentChild.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/unidir/ParentChild.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/unidir/ParentChild.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/unidir/manytoone/ParentChild.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/unidir/manytoone/ParentChild.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/unidir/manytoone/ParentChild.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/unidir/manytoone/ParentChild.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/unidir/onetomany/nonindexed/ParentChild.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/unidir/onetomany/nonindexed/ParentChild.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/unidir/onetomany/nonindexed/ParentChild.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/unidir/onetomany/nonindexed/ParentChild.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/unionsubclass/Beings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/unionsubclass/Beings.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/unionsubclass/Beings.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/unionsubclass/Beings.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/unionsubclass/alias/mapping.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/unionsubclass/alias/mapping.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/unionsubclass/alias/mapping.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/unionsubclass/alias/mapping.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/unionsubclass2/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/unionsubclass2/Person.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/unionsubclass2/Person.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/unionsubclass2/Person.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/util/dtd/Parent.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/util/dtd/Parent.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/util/dtd/Parent.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/util/dtd/Parent.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/util/dtd/child.xml b/hibernate-core/src/test/resources/org/hibernate/test/util/dtd/child.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/util/dtd/child.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/util/dtd/child.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/version/PersonThing.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/version/PersonThing.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/version/PersonThing.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/version/PersonThing.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/version/db/User.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/version/db/User.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/version/db/User.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/version/db/User.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/version/sybase/User.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/version/sybase/User.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/version/sybase/User.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/version/sybase/User.hbm.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/test/where/File.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/where/File.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/java/org/hibernate/test/where/File.hbm.xml
rename to hibernate-core/src/test/resources/org/hibernate/test/where/File.hbm.xml