diff --git a/buildSrc/src/main/groovy/org/hibernate/build/gradle/testing/matrix/MatrixTestingPlugin.groovy b/buildSrc/src/main/groovy/org/hibernate/build/gradle/testing/matrix/MatrixTestingPlugin.groovy index ec290cf8d7..92b7a8c86a 100644 --- a/buildSrc/src/main/groovy/org/hibernate/build/gradle/testing/matrix/MatrixTestingPlugin.groovy +++ b/buildSrc/src/main/groovy/org/hibernate/build/gradle/testing/matrix/MatrixTestingPlugin.groovy @@ -31,7 +31,6 @@ import org.gradle.api.logging.Logger import org.gradle.api.logging.Logging import org.gradle.api.plugins.JavaPluginConvention import org.gradle.api.tasks.SourceSet -import org.gradle.api.tasks.SourceSetContainer import org.gradle.api.tasks.testing.Test import org.hibernate.build.gradle.testing.database.DatabaseProfile import org.hibernate.build.gradle.testing.database.DatabaseProfilePlugin @@ -43,7 +42,7 @@ import static org.gradle.api.plugins.JavaPlugin.TEST_RUNTIME_CONFIGURATION_NAME /** * TODO : 1) add a base configuration of common attribute across all matrix node tasks (convention) - * TODO: 2) somehow allow applying just a single database to a project (non matrix testing). + * TODO : 2) somehow allow applying just a single database to a project (non matrix testing). * * @author Steve Ebersole * @author Strong Liu @@ -54,14 +53,13 @@ public class MatrixTestingPlugin implements Plugin { public static final String MATRIX_COMPILE_CONFIG_NAME = "matrixCompile"; public static final String MATRIX_RUNTIME_CONFIG_NAME = "matrixRuntime"; public static final String MATRIX_TASK_NAME = "matrix"; - public static final String MATRIX_SOURCE_SET_NAME = "matrix"; - public static final String SKIP_UNIT_TEST = "hibernate-matrix-skip-unittest"; private Project project; + private SourceSet testSourceSet; + private Configuration matrixCompileConfig; private Configuration matrixRuntimeConfig; private Task matrixTask; - private SourceSet matrixSourceSet; // currently, only the build jdk is supported private Jdk theJdk = new Jdk(); @@ -78,23 +76,16 @@ public class MatrixTestingPlugin implements Plugin { matrixCompileConfig = prepareCompileConfiguration(); matrixRuntimeConfig = prepareRuntimeConfiguration(); - matrixSourceSet = prepareSourceSet(); + testSourceSet = project.convention.getPlugin( JavaPluginConvention ).sourceSets + .getByName( SourceSet.TEST_SOURCE_SET_NAME ); matrixTask = prepareGroupingTask(); for ( MatrixNode matrixNode: matrixNodes ) { Task matrixNodeTask = prepareNodeTask( matrixNode ); matrixTask.dependsOn( matrixNodeTask ); } - - if ( ! shouldSkipMatrixTestsAgainstDefaultDb() ) { - createTestTaskForMatrixSourceSet(); - } } - private boolean shouldSkipMatrixTestsAgainstDefaultDb() { - return "true".equals( project.properties[SKIP_UNIT_TEST] ) || "true".equals( System.properties[SKIP_UNIT_TEST] ); - } - private List locateMatrixNodes() { List matrixNodes = new ArrayList(); Iterable profiles = project.rootProject.plugins[DatabaseProfilePlugin].databaseProfiles; @@ -127,24 +118,6 @@ public class MatrixTestingPlugin implements Plugin { .extendsFrom( project.configurations.getByName( TEST_RUNTIME_CONFIGURATION_NAME ) ); } - - private SourceSet prepareSourceSet() { - final SourceSetContainer sourceSets = project.convention.getPlugin( JavaPluginConvention ).sourceSets; - SourceSet sourceSet = sourceSets.findByName( MATRIX_SOURCE_SET_NAME ); - if ( sourceSet == null ) { - sourceSet = sourceSets.add( MATRIX_SOURCE_SET_NAME ); - } - final SourceSet mainSourceSet = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME); //sourceSets.main - final SourceSet unitTestSourceSet = sourceSets.getByName(SourceSet.TEST_SOURCE_SET_NAME); //sourceSets.test - sourceSet.compileClasspath = mainSourceSet.output + unitTestSourceSet.output + matrixCompileConfig - sourceSet.runtimeClasspath = sourceSet.output + mainSourceSet.output + unitTestSourceSet.output + matrixRuntimeConfig - sourceSet.output.classesDir = new File(unitTestSourceSet.output.classesDir.parentFile, "matrix") - sourceSet.resources { - setSrcDirs(['src/matrix/java', 'src/matrix/resources']) - } - return sourceSet; - } - private Task prepareGroupingTask() { Task matrixTask = project.tasks.add( MATRIX_TASK_NAME ); matrixTask.group = "Verification" @@ -169,60 +142,18 @@ public class MatrixTestingPlugin implements Plugin { log.debug( "Adding Matrix Testing task $taskName" ); final Test nodeTask = project.tasks.add( taskName, Test ); nodeTask.description = "Runs the matrix against ${node.name}" - nodeTask.classpath = node.databaseProfile.testingRuntimeConfiguration + matrixSourceSet.runtimeClasspath - nodeTask.testClassesDir = matrixSourceSet.output.classesDir + nodeTask.classpath = node.databaseProfile.testingRuntimeConfiguration + testSourceSet.runtimeClasspath + nodeTask.testClassesDir = testSourceSet.output.classesDir nodeTask.ignoreFailures = true nodeTask.workingDir = node.baseOutputDirectory nodeTask.testReportDir = new File(node.baseOutputDirectory, "reports") nodeTask.testResultsDir = new File(node.baseOutputDirectory, "results") - nodeTask.dependsOn( project.tasks.getByName( matrixSourceSet.classesTaskName ) ); + nodeTask.dependsOn( project.tasks.getByName( testSourceSet.classesTaskName ) ); nodeTask.systemProperties = node.databaseAllocation.properties nodeTask.systemProperties['hibernate.test.validatefailureexpected'] = true nodeTask.jvmArgs = ['-Xms1024M', '-Xmx1024M']//, '-XX:MaxPermSize=512M', '-Xss4096k', '-Xverify:none', '-XX:+UseFastAccessorMethods', '-XX:+DisableExplicitGC'] nodeTask.maxHeapSize = "1024M" return nodeTask; } - - /** - * we need create a Test task which runs tests in matrix and also use resources in test.resources - */ - private void createTestTaskForMatrixSourceSet() { - final Test test = project.tasks.test - final Test matrixUnitTask = project.tasks.add("matrixUnitTest", Test) - matrixUnitTask.description = "Run matrix sources as unit test" - matrixUnitTask.classpath = matrixSourceSet.runtimeClasspath - matrixUnitTask.testClassesDir = matrixSourceSet.output.classesDir - - matrixUnitTask.workingDir = test.workingDir - matrixUnitTask.testReportDir = test.testReportDir - matrixUnitTask.testResultsDir = test.testResultsDir - matrixUnitTask.systemProperties = test.systemProperties - test.dependsOn matrixUnitTask - def sourceSets = project.convention.getPlugin(JavaPluginConvention).sourceSets - project.tasks.getByName("processMatrixResources").doLast({ - project.copy { - from(sourceSets.test.java.srcDirs) { - include '**/*.properties' - include '**/*.xml' - } - into matrixSourceSet.output.classesDir - } - project.copy { - from(sourceSets.test.resources.srcDirs) { - include '**/*.properties' - include '**/*.xml' - } - into matrixSourceSet.output.classesDir - } - project.copy { - from(matrixSourceSet.java.srcDirs) { - include '**/*.properties' - include '**/*.xml' - } - into matrixSourceSet.output.classesDir - } - }) - - } } diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle index 529255e9ec..db28cfd2b0 100644 --- a/hibernate-core/hibernate-core.gradle +++ b/hibernate-core/hibernate-core.gradle @@ -32,21 +32,11 @@ dependencies { testRuntime( libraries.javassist ) } -compileMatrixJava.options.define(compilerArgs: ["-proc:none", "-encoding", "UTF-8"]) manifest.mainAttributes( 'Main-Class': 'org.hibernate.Version' ) -sourceSets { - matrix { - java { - srcDir 'src/matrix/java' - } - resources { - srcDir 'src/matrix/resources' - } - } -} + sourceSets.main { jaxbTargetDir = file( "${buildDir}/generated-src/jaxb/main" ) java.srcDir jaxbTargetDir @@ -61,8 +51,6 @@ sourceSets.test.resources { idea { module { sourceDirs += file( '$buildDir/generated-src/antlr/main' ) - testSourceDirs += file( 'src/matrix/java') - testSourceDirs += file( 'src/matrix/resources') } } diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/abstractembeddedcomponents/cid/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/abstractembeddedcomponents/cid/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/abstractembeddedcomponents/cid/MyInterface.java b/hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/MyInterface.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/abstractembeddedcomponents/cid/MyInterface.java rename to hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/MyInterface.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/abstractembeddedcomponents/cid/MyInterfaceImpl.java b/hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/MyInterfaceImpl.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/abstractembeddedcomponents/cid/MyInterfaceImpl.java rename to hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/MyInterfaceImpl.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java rename to hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/abstractembeddedcomponents/propertyref/Address.java b/hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/abstractembeddedcomponents/propertyref/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/abstractembeddedcomponents/propertyref/AddressImpl.java b/hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/AddressImpl.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/abstractembeddedcomponents/propertyref/AddressImpl.java rename to hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/AddressImpl.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/abstractembeddedcomponents/propertyref/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/abstractembeddedcomponents/propertyref/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/abstractembeddedcomponents/propertyref/Server.java b/hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/Server.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/abstractembeddedcomponents/propertyref/Server.java rename to hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/Server.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/abstractembeddedcomponents/propertyref/ServerImpl.java b/hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/ServerImpl.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/abstractembeddedcomponents/propertyref/ServerImpl.java rename to hibernate-core/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/ServerImpl.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/EntityTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/EntityTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/EntityTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/EntityTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/JoinedSubclassTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/JoinedSubclassTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/JoinedSubclassTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/AccessTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/AccessTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/AccessTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/AccessTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/Bed.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/Bed.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/Bed.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/Bed.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/BigBed.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/BigBed.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/BigBed.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/BigBed.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/Chair.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/Chair.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/Chair.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/Chair.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/Closet.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/Closet.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/Closet.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/Closet.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/Foobar.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/Foobar.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/Foobar.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/Foobar.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/Furniture.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/Furniture.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/Furniture.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/Furniture.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/Gardenshed.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/Gardenshed.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/Gardenshed.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/Gardenshed.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/Thingy.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/Thingy.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/Thingy.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/Thingy.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/Woody.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/Woody.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/Woody.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/Woody.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/AccessTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/AccessTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/AccessTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/AccessTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/any/AnyTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/any/AnyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/any/AnyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/any/AnyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/any/CharProperty.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/any/CharProperty.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/any/CharProperty.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/any/CharProperty.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/any/IntegerProperty.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/any/IntegerProperty.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/any/IntegerProperty.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/any/IntegerProperty.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/any/LongProperty.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/any/LongProperty.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/any/LongProperty.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/any/LongProperty.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/any/Property.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/any/Property.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/any/Property.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/any/Property.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/any/PropertyList.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/any/PropertyList.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/any/PropertyList.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/any/PropertyList.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/any/PropertyMap.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/any/PropertyMap.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/any/PropertyMap.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/any/PropertyMap.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/any/PropertySet.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/any/PropertySet.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/any/PropertySet.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/any/PropertySet.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/any/StringProperty.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/any/StringProperty.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/any/StringProperty.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/any/StringProperty.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/any/package-info.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/any/package-info.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/any/package-info.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/any/package-info.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/array/ArrayTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/array/ArrayTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/array/ArrayTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/array/ArrayTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/array/Competitor.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/array/Competitor.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/array/Competitor.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/array/Competitor.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/array/Contest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/array/Contest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/array/Contest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/array/Contest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/Address.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/BeanValidationAutoTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationAutoTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/BeanValidationAutoTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationAutoTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/BeanValidationDisabledTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationDisabledTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/BeanValidationDisabledTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationDisabledTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/BeanValidationGroupsTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationGroupsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/BeanValidationGroupsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationGroupsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/Button.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Button.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/Button.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Button.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/Color.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Color.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/Color.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Color.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/CupHolder.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/CupHolder.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/CupHolder.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/CupHolder.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/DDLWithoutCallbackTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLWithoutCallbackTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/DDLWithoutCallbackTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLWithoutCallbackTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/Display.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Display.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/Display.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Display.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/DisplayConnector.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DisplayConnector.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/DisplayConnector.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DisplayConnector.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/HibernateTraversableResolverTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/HibernateTraversableResolverTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/HibernateTraversableResolverTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/HibernateTraversableResolverTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/MinMax.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MinMax.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/MinMax.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MinMax.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/Music.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Music.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/Music.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Music.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/PowerSupply.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/PowerSupply.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/PowerSupply.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/PowerSupply.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/Range.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Range.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/Range.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Range.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/Rock.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Rock.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/Rock.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Rock.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/Screen.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Screen.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/Screen.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Screen.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/Strict.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Strict.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/Strict.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Strict.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/Tv.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Tv.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/Tv.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Tv.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/TvOwner.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/TvOwner.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/beanvalidation/TvOwner.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/TvOwner.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/bytecode/Hammer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/bytecode/Hammer.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/bytecode/Hammer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/bytecode/Tool.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/bytecode/Tool.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/bytecode/Tool.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/bytecode/Tool.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CascadeTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/CascadeTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CascadeTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/CascadeTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CascadeToEmbeddedManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/CascadeToEmbeddedManyToOneTest.java similarity index 96% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CascadeToEmbeddedManyToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/CascadeToEmbeddedManyToOneTest.java index 3747f90d5b..3127306c8b 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CascadeToEmbeddedManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/CascadeToEmbeddedManyToOneTest.java @@ -1,82 +1,82 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2011, Red Hat Inc. or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Inc. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.test.annotations.cascade; - -import java.util.HashSet; -import java.util.Set; - -import org.junit.Test; - -import org.hibernate.Session; -import org.hibernate.Transaction; -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; - - -public class CascadeToEmbeddedManyToOneTest extends BaseCoreFunctionalTestCase { - - @Test - public void testPersistCascadeToSetOfEmbedded() { - Session sess = openSession(); - try { - final Transaction trx = sess.beginTransaction(); - try { - final Set setOfPairs = new HashSet(); - setOfPairs.add(new PersonPair(new Person("PERSON NAME 1"), new Person("PERSON NAME 2"))); - sess.persist( new CodedPairSetHolder( "CODE", setOfPairs ) ); - sess.flush(); - } finally { - trx.rollback(); - } - } finally { - sess.close(); - } - } - - @Test - public void testPersistCascadeToEmbedded() { - Session sess = openSession(); - try { - final Transaction trx = sess.beginTransaction(); - try { - PersonPair personPair = new PersonPair(new Person("PERSON NAME 1"), new Person("PERSON NAME 2")); - sess.persist( new CodedPairHolder( "CODE", personPair ) ); - sess.flush(); - } finally { - trx.rollback(); - } - } finally { - sess.close(); - } - } - - @Override - protected Class[] getAnnotatedClasses() { - return new Class[]{ - CodedPairSetHolder.class, - CodedPairHolder.class, - Person.class, - PersonPair.class - }; - } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2011, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.test.annotations.cascade; + +import java.util.HashSet; +import java.util.Set; + +import org.junit.Test; + +import org.hibernate.Session; +import org.hibernate.Transaction; +import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; + + +public class CascadeToEmbeddedManyToOneTest extends BaseCoreFunctionalTestCase { + + @Test + public void testPersistCascadeToSetOfEmbedded() { + Session sess = openSession(); + try { + final Transaction trx = sess.beginTransaction(); + try { + final Set setOfPairs = new HashSet(); + setOfPairs.add(new PersonPair(new Person("PERSON NAME 1"), new Person("PERSON NAME 2"))); + sess.persist( new CodedPairSetHolder( "CODE", setOfPairs ) ); + sess.flush(); + } finally { + trx.rollback(); + } + } finally { + sess.close(); + } + } + + @Test + public void testPersistCascadeToEmbedded() { + Session sess = openSession(); + try { + final Transaction trx = sess.beginTransaction(); + try { + PersonPair personPair = new PersonPair(new Person("PERSON NAME 1"), new Person("PERSON NAME 2")); + sess.persist( new CodedPairHolder( "CODE", personPair ) ); + sess.flush(); + } finally { + trx.rollback(); + } + } finally { + sess.close(); + } + } + + @Override + protected Class[] getAnnotatedClasses() { + return new Class[]{ + CodedPairSetHolder.class, + CodedPairHolder.class, + Person.class, + PersonPair.class + }; + } +} diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Child.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/Child.java similarity index 96% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Child.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/Child.java index e850de8777..16c6e489f1 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Child.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/Child.java @@ -1,61 +1,61 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2011, Red Hat Inc. or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Inc. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.test.annotations.cascade; - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; - -/** - * @author Jeff Schnitzer - */ -@Entity -public class Child -{ - /** */ - @Id - @GeneratedValue - public Long id; - - /** */ - @ManyToOne(cascade=CascadeType.PERSIST) - @JoinColumn(name="parentId", nullable=false) - Parent parent; - - /** */ - public Child() {} - - /** */ - public Child(Parent p) - { - this.parent = p; - } - - /** */ - public Parent getParent() { return this.parent; } - public void setParent(Parent value) { this.parent = value; } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2011, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.test.annotations.cascade; + +import javax.persistence.CascadeType; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; + +/** + * @author Jeff Schnitzer + */ +@Entity +public class Child +{ + /** */ + @Id + @GeneratedValue + public Long id; + + /** */ + @ManyToOne(cascade=CascadeType.PERSIST) + @JoinColumn(name="parentId", nullable=false) + Parent parent; + + /** */ + public Child() {} + + /** */ + public Child(Parent p) + { + this.parent = p; + } + + /** */ + public Parent getParent() { return this.parent; } + public void setParent(Parent value) { this.parent = value; } +} diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CodedPairHolder.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/CodedPairHolder.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CodedPairHolder.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/CodedPairHolder.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CodedPairSetHolder.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/CodedPairSetHolder.java similarity index 96% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CodedPairSetHolder.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/CodedPairSetHolder.java index 6ef28b3af0..610db2e169 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CodedPairSetHolder.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/CodedPairSetHolder.java @@ -1,112 +1,112 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2011, Red Hat Inc. or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Inc. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.test.annotations.cascade; - -import java.io.Serializable; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Table; - -import org.hibernate.annotations.ForeignKey; - -@Entity -@Table(name = "CODED_PAIR_SET_HOLDER") -class CodedPairSetHolder implements Serializable { - - private static final long serialVersionUID = 3757670856634990003L; - - @Id - @GeneratedValue - @Column(name = "ID") - private Long id; - - @Column(name = "CODE", nullable = false, unique = true, updatable = false, length = 256) - private String code; - - @ElementCollection - @JoinTable(name = "CODED_PAIR_HOLDER_PAIR_SET", joinColumns = @JoinColumn(name = "CODED_PAIR_HOLDER_ID")) - @ForeignKey(name = "FK_PAIR_SET") - private final Set pairs = new HashSet(0); - - CodedPairSetHolder() { - super(); - } - - CodedPairSetHolder(final String pCode, final Set pPersonPairs) { - super(); - this.code = pCode; - this.pairs.addAll(pPersonPairs); - } - - Long getId() { - return this.id; - } - - String getCode() { - return this.code; - } - - Set getPairs() { - return Collections.unmodifiableSet(this.pairs); - } - - @Override - public int hashCode() { - final int prime = 101; - int result = 1; - result = prime * result + ((getCode() == null) ? 0 : getCode().hashCode()); - return result; - } - - @Override - public boolean equals(final Object pObject) { - if (this == pObject) { - return true; - } - if (pObject == null) { - return false; - } - if (!(pObject instanceof CodedPairSetHolder )) { - return false; - } - final CodedPairSetHolder other = (CodedPairSetHolder) pObject; - if (getCode() == null) { - if (other.getCode() != null) { - return false; - } - } else if (!getCode().equals(other.getCode())) { - return false; - } - return true; - } - -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2011, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.test.annotations.cascade; + +import java.io.Serializable; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; +import javax.persistence.Column; +import javax.persistence.ElementCollection; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.Table; + +import org.hibernate.annotations.ForeignKey; + +@Entity +@Table(name = "CODED_PAIR_SET_HOLDER") +class CodedPairSetHolder implements Serializable { + + private static final long serialVersionUID = 3757670856634990003L; + + @Id + @GeneratedValue + @Column(name = "ID") + private Long id; + + @Column(name = "CODE", nullable = false, unique = true, updatable = false, length = 256) + private String code; + + @ElementCollection + @JoinTable(name = "CODED_PAIR_HOLDER_PAIR_SET", joinColumns = @JoinColumn(name = "CODED_PAIR_HOLDER_ID")) + @ForeignKey(name = "FK_PAIR_SET") + private final Set pairs = new HashSet(0); + + CodedPairSetHolder() { + super(); + } + + CodedPairSetHolder(final String pCode, final Set pPersonPairs) { + super(); + this.code = pCode; + this.pairs.addAll(pPersonPairs); + } + + Long getId() { + return this.id; + } + + String getCode() { + return this.code; + } + + Set getPairs() { + return Collections.unmodifiableSet(this.pairs); + } + + @Override + public int hashCode() { + final int prime = 101; + int result = 1; + result = prime * result + ((getCode() == null) ? 0 : getCode().hashCode()); + return result; + } + + @Override + public boolean equals(final Object pObject) { + if (this == pObject) { + return true; + } + if (pObject == null) { + return false; + } + if (!(pObject instanceof CodedPairSetHolder )) { + return false; + } + final CodedPairSetHolder other = (CodedPairSetHolder) pObject; + if (getCode() == null) { + if (other.getCode() != null) { + return false; + } + } else if (!getCode().equals(other.getCode())) { + return false; + } + return true; + } + +} diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Mouth.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/Mouth.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Mouth.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/Mouth.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/NonNullableCircularDependencyCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/NonNullableCircularDependencyCascadeTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/NonNullableCircularDependencyCascadeTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/NonNullableCircularDependencyCascadeTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/Parent.java similarity index 96% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Parent.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/Parent.java index 8adeb7c4a4..37d4b416ac 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Parent.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/Parent.java @@ -1,65 +1,65 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2011, Red Hat Inc. or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Inc. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.test.annotations.cascade; - -import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; - -/** - * @author Jeff Schnitzer - */ -@Entity -public class Parent -{ - /** */ - @Id - @GeneratedValue - public Long id; - - /** */ - @OneToMany(cascade=CascadeType.ALL, mappedBy="parent") - public Set children; - - /** */ - @OneToOne(cascade=CascadeType.ALL) - @JoinColumn(name="defaultChildId", nullable=false) - Child defaultChild; - - /** */ - public Parent() {} - - /** */ - public Child getDefaultChild() { return this.defaultChild; } - public void setDefaultChild(Child value) { this.defaultChild = value; } - - /** */ - public Set getChildren() { return this.children; } - public void setChildren(Set value) { this.children = value; } -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2011, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.test.annotations.cascade; + +import java.util.Set; +import javax.persistence.CascadeType; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToMany; +import javax.persistence.OneToOne; + +/** + * @author Jeff Schnitzer + */ +@Entity +public class Parent +{ + /** */ + @Id + @GeneratedValue + public Long id; + + /** */ + @OneToMany(cascade=CascadeType.ALL, mappedBy="parent") + public Set children; + + /** */ + @OneToOne(cascade=CascadeType.ALL) + @JoinColumn(name="defaultChildId", nullable=false) + Child defaultChild; + + /** */ + public Parent() {} + + /** */ + public Child getDefaultChild() { return this.defaultChild; } + public void setDefaultChild(Child value) { this.defaultChild = value; } + + /** */ + public Set getChildren() { return this.children; } + public void setChildren(Set value) { this.children = value; } +} diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/Person.java similarity index 96% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/Person.java index f782c590d6..9ba6be9431 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Person.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/Person.java @@ -1,94 +1,94 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2011, Red Hat Inc. or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Inc. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.test.annotations.cascade; - -import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "PERSON") -class Person implements Serializable { - - private static final long serialVersionUID = 960914272100925312L; - - @Id - @GeneratedValue - @Column(name = "ID") - private Long id; - - @Column(name = "NAME", nullable = false, unique = true, updatable = false, length = 256) - private String name; - - Person() { - super(); - } - - Person(final String pName) { - super(); - this.name = pName; - } - - Long getId() { - return this.id; - } - - String getName() { - return this.name; - } - - @Override - public int hashCode() { - final int prime = 103; - int result = 1; - result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); - return result; - } - - @Override - public boolean equals(final Object pObject) { - if (this == pObject) { - return true; - } - if (pObject == null) { - return false; - } - if (!(pObject instanceof Person)) { - return false; - } - final Person other = (Person) pObject; - if (getName() == null) { - if (other.getName() != null) { - return false; - } - } else if (!getName().equals(other.getName())) { - return false; - } - return true; - } - -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2011, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.test.annotations.cascade; + +import java.io.Serializable; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name = "PERSON") +class Person implements Serializable { + + private static final long serialVersionUID = 960914272100925312L; + + @Id + @GeneratedValue + @Column(name = "ID") + private Long id; + + @Column(name = "NAME", nullable = false, unique = true, updatable = false, length = 256) + private String name; + + Person() { + super(); + } + + Person(final String pName) { + super(); + this.name = pName; + } + + Long getId() { + return this.id; + } + + String getName() { + return this.name; + } + + @Override + public int hashCode() { + final int prime = 103; + int result = 1; + result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); + return result; + } + + @Override + public boolean equals(final Object pObject) { + if (this == pObject) { + return true; + } + if (pObject == null) { + return false; + } + if (!(pObject instanceof Person)) { + return false; + } + final Person other = (Person) pObject; + if (getName() == null) { + if (other.getName() != null) { + return false; + } + } else if (!getName().equals(other.getName())) { + return false; + } + return true; + } + +} diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/PersonPair.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/PersonPair.java similarity index 96% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/PersonPair.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/PersonPair.java index 1dd8e1d115..42a7cc1e15 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/PersonPair.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/PersonPair.java @@ -1,106 +1,106 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2011, Red Hat Inc. or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Inc. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.test.annotations.cascade; - -import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; - -import org.hibernate.annotations.ForeignKey; - -@Embeddable -class PersonPair implements Serializable { - - private static final long serialVersionUID = 4543565503074112720L; - - @ManyToOne(optional = false, fetch = FetchType.LAZY, cascade = { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH }) - @JoinColumn(name = "LEFT_PERSON_ID", nullable = false, updatable = false) - @ForeignKey(name = "FK_LEFT_PERSON") - private Person left; - - @ManyToOne(optional = false, fetch = FetchType.LAZY, cascade = { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH }) - @JoinColumn(name = "RIGHT_PERSON_ID", nullable = false, updatable = false) - @ForeignKey(name = "FK_RIGHT_PERSON") - private Person right; - - PersonPair() { - super(); - } - - PersonPair(final Person pLeft, final Person pRight) { - super(); - this.left = pLeft; - this.right = pRight; - } - - Person getLeft() { - return this.left; - } - - Person getRight() { - return this.right; - } - - @Override - public int hashCode() { - final int prime = 107; - int result = 1; - result = prime * result + ((getLeft() == null) ? 0 : getLeft().hashCode()); - result = prime * result + ((getRight() == null) ? 0 : getRight().hashCode()); - return result; - } - - @Override - public boolean equals(final Object pObject) { - if (this == pObject) { - return true; - } - if (pObject == null) { - return false; - } - if (!(pObject instanceof PersonPair)) { - return false; - } - final PersonPair other = (PersonPair) pObject; - if (getRight() == null) { - if (other.getRight() != null) { - return false; - } - } else if (!getRight().equals(other.getRight())) { - return false; - } - if (getLeft() == null) { - if (other.getLeft() != null) { - return false; - } - } else if (!getLeft().equals(other.getLeft())) { - return false; - } - return true; - } - -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2011, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.test.annotations.cascade; + +import java.io.Serializable; +import javax.persistence.CascadeType; +import javax.persistence.Embeddable; +import javax.persistence.FetchType; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; + +import org.hibernate.annotations.ForeignKey; + +@Embeddable +class PersonPair implements Serializable { + + private static final long serialVersionUID = 4543565503074112720L; + + @ManyToOne(optional = false, fetch = FetchType.LAZY, cascade = { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH }) + @JoinColumn(name = "LEFT_PERSON_ID", nullable = false, updatable = false) + @ForeignKey(name = "FK_LEFT_PERSON") + private Person left; + + @ManyToOne(optional = false, fetch = FetchType.LAZY, cascade = { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH }) + @JoinColumn(name = "RIGHT_PERSON_ID", nullable = false, updatable = false) + @ForeignKey(name = "FK_RIGHT_PERSON") + private Person right; + + PersonPair() { + super(); + } + + PersonPair(final Person pLeft, final Person pRight) { + super(); + this.left = pLeft; + this.right = pRight; + } + + Person getLeft() { + return this.left; + } + + Person getRight() { + return this.right; + } + + @Override + public int hashCode() { + final int prime = 107; + int result = 1; + result = prime * result + ((getLeft() == null) ? 0 : getLeft().hashCode()); + result = prime * result + ((getRight() == null) ? 0 : getRight().hashCode()); + return result; + } + + @Override + public boolean equals(final Object pObject) { + if (this == pObject) { + return true; + } + if (pObject == null) { + return false; + } + if (!(pObject instanceof PersonPair)) { + return false; + } + final PersonPair other = (PersonPair) pObject; + if (getRight() == null) { + if (other.getRight() != null) { + return false; + } + } else if (!getRight().equals(other.getRight())) { + return false; + } + if (getLeft() == null) { + if (other.getLeft() != null) { + return false; + } + } else if (!getLeft().equals(other.getLeft())) { + return false; + } + return true; + } + +} diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Tooth.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/Tooth.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Tooth.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/Tooth.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/A.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/identity/A.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/A.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/identity/A.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/identity/AbstractEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/AbstractEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/identity/AbstractEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/B.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/identity/B.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/B.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/identity/B.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/C.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/identity/C.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/C.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/identity/C.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/CascadeCircleIdentityIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/identity/CascadeCircleIdentityIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/CascadeCircleIdentityIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/identity/CascadeCircleIdentityIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/D.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/identity/D.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/D.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/identity/D.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/E.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/identity/E.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/E.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/identity/E.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/F.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/identity/F.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/F.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/identity/F.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/G.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/identity/G.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/G.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/identity/G.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/H.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/identity/H.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/H.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/identity/H.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/A.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/sequence/A.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/A.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/sequence/A.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/sequence/AbstractEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/AbstractEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/sequence/AbstractEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/B.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/sequence/B.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/B.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/sequence/B.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/C.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/sequence/C.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/C.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/sequence/C.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/CascadeCircleSequenceIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/sequence/CascadeCircleSequenceIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/CascadeCircleSequenceIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/sequence/CascadeCircleSequenceIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/D.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/sequence/D.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/D.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/sequence/D.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/E.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/sequence/E.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/E.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/sequence/E.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/F.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/sequence/F.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/F.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/sequence/F.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/G.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/sequence/G.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/G.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/sequence/G.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/H.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/sequence/H.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/H.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/circle/sequence/H.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/AbstractEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/AbstractEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/AbstractEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/B.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/B.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/B.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/B.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/C.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/C.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/C.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/C.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/D.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/D.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/D.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/D.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/E.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/E.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/E.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/E.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/F.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/F.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/F.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/F.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/G.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/G.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/G.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/G.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/MultiCircleJpaCascadeIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/MultiCircleJpaCascadeIdentityTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/MultiCircleJpaCascadeIdentityTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/identity/MultiCircleJpaCascadeIdentityTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/AbstractEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/AbstractEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/AbstractEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/B.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/B.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/B.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/B.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/C.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/C.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/C.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/C.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/D.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/D.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/D.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/D.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/E.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/E.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/E.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/E.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/F.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/F.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/F.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/F.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/G.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/G.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/G.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/G.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/MultiCircleJpaCascadeSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/MultiCircleJpaCascadeSequenceTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/MultiCircleJpaCascadeSequenceTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/jpa/sequence/MultiCircleJpaCascadeSequenceTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/AbstractEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/AbstractEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/AbstractEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/B.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/B.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/B.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/B.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/C.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/C.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/C.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/C.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/D.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/D.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/D.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/D.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/E.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/E.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/E.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/E.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/F.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/F.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/F.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/F.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/G.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/G.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/G.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/G.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/MultiCircleNonJpaCascadeIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/MultiCircleNonJpaCascadeIdentityTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/MultiCircleNonJpaCascadeIdentityTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/identity/MultiCircleNonJpaCascadeIdentityTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/AbstractEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/AbstractEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/AbstractEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/B.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/B.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/B.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/B.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/C.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/C.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/C.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/C.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/D.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/D.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/D.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/D.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/E.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/E.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/E.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/E.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/F.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/F.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/F.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/F.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/G.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/G.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/G.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/G.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/MultiCircleNonJpaCascadeSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/MultiCircleNonJpaCascadeSequenceTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/MultiCircleNonJpaCascadeSequenceTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/multicircle/nonjpa/sequence/MultiCircleNonJpaCascadeSequenceTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/A.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/A.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/A.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/A.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/AId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/AId.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/AId.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/AId.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/B.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/B.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/B.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/B.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/C.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/C.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/C.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/C.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/Channel.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/Channel.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/Channel.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/Channel.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/Child.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/Child.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/Child.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/Child.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/ChildPk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/ChildPk.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/ChildPk.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/ChildPk.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/CompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/CompositeIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/LittleGenius.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/LittleGenius.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/LittleGenius.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/LittleGenius.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/Order.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/Order.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/Order.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/Order.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/OrderLine.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/OrderLine.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/OrderLine.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/OrderLine.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/OrderLinePk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/OrderLinePk.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/OrderLinePk.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/OrderLinePk.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/Parent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/Parent.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/Parent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/ParentPk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/ParentPk.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/ParentPk.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/ParentPk.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/Presenter.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/Presenter.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/Presenter.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/Presenter.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/Product.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/Product.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/Product.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/Product.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/SomeEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/SomeEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/SomeEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/SomeEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/SomeEntityId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/SomeEntityId.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/TvMagazin.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/TvMagazin.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/TvMagazin.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/TvMagazin.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/TvMagazinPk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/TvMagazinPk.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/TvMagazinPk.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/TvMagazinPk.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/TvProgram.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/TvProgram.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/TvProgram.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/TvProgram.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/TvProgramIdClass.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/TvProgramIdClass.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/TvProgramIdClass.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/TvProgramIdClass.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/keymanytoone/Card.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/Card.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/keymanytoone/Card.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/Card.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/keymanytoone/CardField.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/CardField.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/keymanytoone/CardField.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/CardField.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/keymanytoone/Key.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/Key.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/keymanytoone/Key.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/Key.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/keymanytoone/PrimaryKey.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/PrimaryKey.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/cid/keymanytoone/PrimaryKey.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/cid/keymanytoone/PrimaryKey.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/Boy.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/Boy.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/Brand.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Brand.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/Brand.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Brand.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/Bug.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Bug.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/Bug.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Bug.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/BugSystem.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/BugSystem.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/BugSystem.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/BugSystem.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/Character.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Character.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/Character.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Character.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/CountryAttitude.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/CountryAttitude.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/CountryAttitude.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/CountryAttitude.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/FavoriteFood.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/FavoriteFood.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/FavoriteFood.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/FavoriteFood.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/Matrix.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Matrix.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/Matrix.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Matrix.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/OrderByTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/OrderByTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/OrderByTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/OrderByTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/Products.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Products.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/Products.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Products.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/TestCourse.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/TestCourse.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/TestCourse.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/TestCourse.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/Toy.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Toy.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/Toy.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Toy.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/Widgets.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Widgets.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/Widgets.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Widgets.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/Location.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/Location.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/Location.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/Location.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/Query.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/Query.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/Query.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/Query.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Contact.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Contact.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Contact.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Contact.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Sale.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Sale.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Sale.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Sale.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/dataTypes/BasicOperationsTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/dataTypes/BasicOperationsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/dataTypes/BasicOperationsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/dataTypes/BasicOperationsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/dataTypes/Grade.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/dataTypes/Grade.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/dataTypes/Grade.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/dataTypes/Grade.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/dataTypes/SomeEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/dataTypes/SomeEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/dataTypes/SomeEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/dataTypes/SomeEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/dataTypes/SomeOtherEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/dataTypes/SomeOtherEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/dataTypes/SomeOtherEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/dataTypes/SomeOtherEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/Address.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/AddressType.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/AddressType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/AddressType.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/AddressType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/Book.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/Book.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/Book.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/Book.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/CorpType.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/CorpType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/CorpType.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/CorpType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/Country.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/Country.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/Country.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/Country.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/Deal.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/Deal.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/Deal.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/Deal.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/FavoriteThings.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/FavoriteThings.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/FavoriteThings.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/FavoriteThings.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/FixedLeg.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/FixedLeg.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/FixedLeg.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/FixedLeg.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/FloatLeg.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/FloatLeg.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/FloatLeg.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/FloatLeg.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/InternetFavorites.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/InternetFavorites.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/InternetFavorites.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/InternetFavorites.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/InternetProvider.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/InternetProvider.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/InternetProvider.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/InternetProvider.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/Leg.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/Leg.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/Leg.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/Leg.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/LegalStructure.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/LegalStructure.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/LegalStructure.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/LegalStructure.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/Manager.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/Manager.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/Manager.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/Manager.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/Nationality.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/Nationality.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/Nationality.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/Nationality.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/NotonialDeal.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/NotonialDeal.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/NotonialDeal.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/NotonialDeal.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/RegionalArticle.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticle.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/RegionalArticle.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticle.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/RegionalArticlePk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticlePk.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/RegionalArticlePk.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticlePk.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/SpreadDeal.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/SpreadDeal.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/SpreadDeal.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/SpreadDeal.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/Summary.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/Summary.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/Summary.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/Summary.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/Swap.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/Swap.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/Swap.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/Swap.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/URLFavorite.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/URLFavorite.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/URLFavorite.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/URLFavorite.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/VanillaSwap.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/VanillaSwap.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/VanillaSwap.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/VanillaSwap.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/WealthyPerson.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/WealthyPerson.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/WealthyPerson.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/WealthyPerson.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/many2one/Address.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/many2one/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/many2one/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/many2one/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/many2one/Country.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/many2one/Country.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/many2one/Country.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/many2one/Country.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/many2one/EmbeddableWithMany2OneTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/many2one/EmbeddableWithMany2OneTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/many2one/EmbeddableWithMany2OneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/many2one/EmbeddableWithMany2OneTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/many2one/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/many2one/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/many2one/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/many2one/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/one2many/Alias.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/one2many/Alias.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/one2many/Alias.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/one2many/Alias.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/one2many/Name.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/one2many/Name.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/one2many/Name.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/one2many/Name.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/one2many/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/one2many/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/one2many/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/one2many/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/one2many/PersonName.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/one2many/PersonName.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/embedded/one2many/PersonName.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/embedded/one2many/PersonName.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/engine/collection/Father.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/engine/collection/Father.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/engine/collection/Father.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/engine/collection/Father.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/engine/collection/Mother.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/engine/collection/Mother.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/engine/collection/Mother.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/engine/collection/Mother.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/engine/collection/Son.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/engine/collection/Son.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/engine/collection/Son.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/engine/collection/Son.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/engine/collection/UnidirCollectionWithMultipleOwnerTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/engine/collection/UnidirCollectionWithMultipleOwnerTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/engine/collection/UnidirCollectionWithMultipleOwnerTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/engine/collection/UnidirCollectionWithMultipleOwnerTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Address.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Bid.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Bid.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Bid.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Bid.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Car.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Car.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Car.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Car.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/CasterStringType.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/CasterStringType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/CasterStringType.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/CasterStringType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/CommunityBid.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/CommunityBid.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/CommunityBid.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/CommunityBid.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/ContactDetails.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/ContactDetails.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/ContactDetails.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/ContactDetails.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Country.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Country.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Country.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Country.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Drill.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Drill.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Drill.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Drill.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/FirstName.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/FirstName.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/FirstName.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/FirstName.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Flight.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Flight.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Flight.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Flight.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Forest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Forest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Forest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Forest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Forest2.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Forest2.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Forest2.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Forest2.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/FormalLastName.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/FormalLastName.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/FormalLastName.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/FormalLastName.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Java5FeaturesTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Java5FeaturesTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Java5FeaturesTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Java5FeaturesTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/LastName.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/LastName.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/LastName.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/LastName.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Length.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Length.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Length.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Length.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/LocalContactDetails.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/LocalContactDetails.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/LocalContactDetails.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/LocalContactDetails.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/MonetaryAmount.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/MonetaryAmount.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/MonetaryAmount.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/MonetaryAmount.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/MonetaryAmountUserType.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/MonetaryAmountUserType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/MonetaryAmountUserType.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/MonetaryAmountUserType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Name.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Name.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Name.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Name.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Narrative.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Narrative.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Narrative.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Narrative.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/NewCustomEntityMappingAnnotationsTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/NewCustomEntityMappingAnnotationsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/NewCustomEntityMappingAnnotationsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/NewCustomEntityMappingAnnotationsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/OverseasPhoneNumber.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/OverseasPhoneNumber.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/OverseasPhoneNumber.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/OverseasPhoneNumber.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Peugot.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Peugot.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Peugot.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Peugot.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/PhoneNumber.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/PhoneNumber.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/PhoneNumber.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/PhoneNumber.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/PhoneNumberType.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/PhoneNumberType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/PhoneNumberType.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/PhoneNumberType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Player.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Player.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Player.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Player.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/PowerDrill.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/PowerDrill.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/PowerDrill.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/PowerDrill.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Race.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Race.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Race.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Race.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Ransom.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Ransom.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Ransom.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Ransom.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/SoccerTeam.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/SoccerTeam.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/SoccerTeam.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/SoccerTeam.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Starred.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Starred.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Starred.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Starred.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Tool.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Tool.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Tool.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Tool.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Topic.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Topic.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Topic.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Topic.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Tree.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Tree.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Tree.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Tree.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/WashingMachine.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/WashingMachine.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/WashingMachine.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/WashingMachine.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Widget.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Widget.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Widget.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Widget.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/ZipCode.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/ZipCode.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/ZipCode.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/ZipCode.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/package-info.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/package-info.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/package-info.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/package-info.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entitynonentity/Cellular.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Cellular.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entitynonentity/Cellular.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Cellular.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entitynonentity/Communication.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Communication.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entitynonentity/Communication.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Communication.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entitynonentity/EntityNonEntityTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/EntityNonEntityTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entitynonentity/EntityNonEntityTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/EntityNonEntityTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entitynonentity/GSM.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/GSM.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entitynonentity/GSM.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/GSM.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entitynonentity/Interaction.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Interaction.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entitynonentity/Interaction.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Interaction.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entitynonentity/Phone.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Phone.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entitynonentity/Phone.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Phone.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entitynonentity/Voice.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Voice.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entitynonentity/Voice.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entitynonentity/Voice.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetch/Branch.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fetch/Branch.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetch/Branch.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fetch/Branch.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetch/FetchingTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fetch/FetchingTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetch/FetchingTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fetch/FetchingTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetch/Leaf.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fetch/Leaf.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetch/Leaf.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fetch/Leaf.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetch/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fetch/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetch/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fetch/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetch/Stay.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fetch/Stay.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetch/Stay.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fetch/Stay.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/Classes.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/generics/Classes.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/Classes.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/generics/Classes.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/DNA.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/generics/DNA.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/DNA.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/generics/DNA.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/Dummy.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/generics/Dummy.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/Dummy.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/generics/Dummy.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/Gene.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/generics/Gene.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/Gene.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/generics/Gene.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/GenericsTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/generics/GenericsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/GenericsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/generics/GenericsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/Item.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/generics/Item.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/Item.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/generics/Item.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/Paper.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/generics/Paper.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/Paper.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/generics/Paper.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/PaperType.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/generics/PaperType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/PaperType.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/generics/PaperType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/Price.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/generics/Price.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/Price.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/generics/Price.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/PricedStuff.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/generics/PricedStuff.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/PricedStuff.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/generics/PricedStuff.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/SomeGuy.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/generics/SomeGuy.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/SomeGuy.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/generics/SomeGuy.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/State.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/generics/State.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/State.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/generics/State.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/StateType.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/generics/StateType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/StateType.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/generics/StateType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/Stuff.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/generics/Stuff.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/Stuff.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/generics/Stuff.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/UnresolvedTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/generics/UnresolvedTypeTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/UnresolvedTypeTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/generics/UnresolvedTypeTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/WildEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/generics/WildEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/generics/WildEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/generics/WildEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/genericsinheritance/Child.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/genericsinheritance/Child.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/genericsinheritance/Child.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/genericsinheritance/Child.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy1.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy1.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy1.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy1.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy2.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy2.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy2.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy2.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy22.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy22.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy22.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy22.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/genericsinheritance/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/genericsinheritance/Parent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/genericsinheritance/Parent.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/genericsinheritance/Parent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy1.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy1.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy1.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy1.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy2.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy2.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy2.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy2.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy22.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy22.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy22.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy22.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/EnumIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/EnumIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/EnumIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/EnumIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/IdClassTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/IdClassTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/IdClassTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/IdClassTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/IdTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/IdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/IdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/IdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/generationmappings/AutoEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/generationmappings/AutoEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/generationmappings/AutoEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/generationmappings/AutoEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/generationmappings/CompleteSequenceEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/generationmappings/CompleteSequenceEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/generationmappings/CompleteSequenceEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/generationmappings/CompleteSequenceEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/generationmappings/DedicatedSequenceEntity1.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/generationmappings/DedicatedSequenceEntity1.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/generationmappings/DedicatedSequenceEntity1.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/generationmappings/DedicatedSequenceEntity1.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/generationmappings/DedicatedSequenceEntity2.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/generationmappings/DedicatedSequenceEntity2.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/generationmappings/DedicatedSequenceEntity2.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/generationmappings/DedicatedSequenceEntity2.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/generationmappings/MinimalSequenceEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/generationmappings/MinimalSequenceEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/generationmappings/MinimalSequenceEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/generationmappings/MinimalSequenceEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/generationmappings/MinimalTableEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/generationmappings/MinimalTableEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/generationmappings/MinimalTableEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/generationmappings/MinimalTableEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/generationmappings/package-info.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/generationmappings/package-info.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/generationmappings/package-info.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/generationmappings/package-info.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/sequences/IdClassTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/IdClassTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/sequences/IdClassTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/IdClassTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/sequences/IdTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/sequences/IdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/sequences/JoinColumnOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/JoinColumnOverrideTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/sequences/JoinColumnOverrideTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/JoinColumnOverrideTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/sequences/UUIDGenerator.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/UUIDGenerator.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/sequences/UUIDGenerator.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/UUIDGenerator.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/sequences/package-info.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/package-info.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/sequences/package-info.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/package-info.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclass/DomainAdmin.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idclass/DomainAdmin.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclass/DomainAdmin.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idclass/DomainAdmin.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclass/DomainAdminId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idclass/DomainAdminId.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclass/DomainAdminId.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idclass/DomainAdminId.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclass/IdClassCompositePKTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idclass/IdClassCompositePKTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclass/IdClassCompositePKTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idclass/IdClassCompositePKTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclass/xml/IdClassXmlTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idclass/xml/IdClassXmlTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclass/xml/IdClassXmlTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idclass/xml/IdClassXmlTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclassgeneratedvalue/Multiple.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Multiple.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclassgeneratedvalue/Multiple.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Multiple.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclassgeneratedvalue/MultiplePK.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/MultiplePK.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclassgeneratedvalue/MultiplePK.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/MultiplePK.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple2.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple2.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple2.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/Simple2.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclassgeneratedvalue/SimplePK.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/SimplePK.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idclassgeneratedvalue/SimplePK.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idclassgeneratedvalue/SimplePK.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/identifiercollection/Passport.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/identifiercollection/Passport.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/identifiercollection/Passport.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/identifiercollection/Passport.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/identifiercollection/Stamp.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/identifiercollection/Stamp.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/identifiercollection/Stamp.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/identifiercollection/Stamp.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/BasketItems.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItems.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/BasketItems.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItems.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/BasketItemsPK.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItemsPK.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/BasketItemsPK.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItemsPK.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/Card.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/Card.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/Card.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/Card.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/CardField.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/CardField.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/CardField.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/CardField.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/CardKey.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/CardKey.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/CardKey.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/CardKey.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/Customers.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/Customers.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/Customers.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/Customers.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/IdManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/IdManyToOneTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/IdManyToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/IdManyToOneTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/Project.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/Project.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/Project.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/Project.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/ShoppingBaskets.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/ShoppingBaskets.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/ShoppingBaskets.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/ShoppingBaskets.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/ShoppingBasketsPK.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/ShoppingBasketsPK.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/ShoppingBasketsPK.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/ShoppingBasketsPK.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/Store.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/Store.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/Store.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/Store.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/StoreCustomer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/StoreCustomer.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/StoreCustomerPK.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomerPK.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/StoreCustomerPK.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomerPK.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/A.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/A.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/A.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/A.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Acces.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Acces.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Acces.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Acces.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/B.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/B.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/B.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/B.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/BId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/BId.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/BId.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/BId.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Benefserv.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Benefserv.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Benefserv.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Benefserv.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/C.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/C.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/C.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/C.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/CId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/CId.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/CId.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/CId.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Droitacces.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Droitacces.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Droitacces.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Droitacces.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Service.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Service.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Service.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Service.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/immutable/Country.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/immutable/Country.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/immutable/Country.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/immutable/Country.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/immutable/Foobar.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/immutable/Foobar.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/immutable/Foobar.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/immutable/Foobar.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/immutable/ImmutableTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/immutable/ImmutableTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/immutable/State.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/immutable/State.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/immutable/State.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/immutable/State.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/AddressBook.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/AddressBook.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/AddressBook.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/AddressBook.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/AddressEntry.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntry.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/AddressEntry.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntry.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/AddressEntryPk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntryPk.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/AddressEntryPk.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntryPk.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/AlphabeticalDirectory.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/AlphabeticalDirectory.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/AlphabeticalDirectory.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/AlphabeticalDirectory.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Drawer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Drawer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Drawer.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Drawer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Dress.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Dress.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Dress.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Dress.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Gas.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Gas.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Gas.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Gas.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/GasKey.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/GasKey.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/GasKey.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/GasKey.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Generation.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Generation.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Generation.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Generation.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/GenerationGroup.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationGroup.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/GenerationGroup.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationGroup.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/GenerationUser.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationUser.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/GenerationUser.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationUser.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/News.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/News.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/News.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/News.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Newspaper.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Newspaper.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Newspaper.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Newspaper.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Painter.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Painter.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Painter.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Painter.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Painting.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Painting.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Painting.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Painting.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/PaintingPk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/PaintingPk.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/PaintingPk.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/PaintingPk.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/PressReleaseAgency.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/PressReleaseAgency.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/PressReleaseAgency.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/PressReleaseAgency.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Software.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Software.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Software.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Software.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Trainee.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Trainee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Trainee.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Trainee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Training.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Training.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Training.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Training.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Version.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Version.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Version.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Version.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Wardrobe.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Wardrobe.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/indexcoll/Wardrobe.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/indexcoll/Wardrobe.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/Apple.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/Apple.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/Apple.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/Apple.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/Carrot.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/Carrot.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/Carrot.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/Carrot.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/Fruit.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/Fruit.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/Fruit.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/Fruit.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/SubclassTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/SubclassTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/SubclassTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/SubclassTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/Tomato.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/Tomato.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/Tomato.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/Tomato.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/Vegetable.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/Vegetable.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/Vegetable.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/Vegetable.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/VegetablePk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/VegetablePk.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/VegetablePk.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/VegetablePk.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Account.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Account.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Account.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Account.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Alarm.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Alarm.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Alarm.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Alarm.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Asset.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Asset.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Client.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Client.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Client.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Client.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Clothing.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Clothing.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Clothing.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Clothing.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Company.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Company.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Company.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Company.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Document.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Document.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Document.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Document.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/EventInformation.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/EventInformation.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/EventInformation.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/EventInformation.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/File.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/File.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/File.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/File.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/FinancialAsset.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/FinancialAsset.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/FinancialAsset.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/FinancialAsset.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Folder.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Folder.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Folder.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Folder.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/LegalEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/LegalEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/LegalEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/LegalEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Parent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Parent.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Parent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Pool.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Pool.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Pool.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Pool.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/PoolAddress.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/PoolAddress.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/PoolAddress.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/PoolAddress.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/ProgramExecution.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/ProgramExecution.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/ProgramExecution.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/ProgramExecution.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/PropertyAsset.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/PropertyAsset.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/PropertyAsset.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/PropertyAsset.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Sweater.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Sweater.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/Sweater.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/Sweater.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/SwimmingPool.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/SwimmingPool.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/SwimmingPool.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/SwimmingPool.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/SymbolicLink.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/SymbolicLink.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/joined/SymbolicLink.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/joined/SymbolicLink.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/mixed/Document.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/mixed/Document.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/mixed/Document.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/mixed/Document.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/mixed/File.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/mixed/File.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/mixed/File.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/mixed/File.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/mixed/Folder.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/mixed/Folder.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/mixed/Folder.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/mixed/Folder.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/mixed/SubclassTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/mixed/SubclassTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/mixed/SubclassTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/mixed/SubclassTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/mixed/SymbolicLink.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/mixed/SymbolicLink.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/mixed/SymbolicLink.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/mixed/SymbolicLink.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/singletable/Building.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Building.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/singletable/Building.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Building.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/singletable/Funk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Funk.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/singletable/Funk.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Funk.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/singletable/House.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/singletable/House.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/singletable/House.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/singletable/House.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/singletable/Music.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Music.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/singletable/Music.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Music.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/singletable/Noise.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Noise.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/singletable/Noise.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Noise.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/singletable/PaperTrash.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/singletable/PaperTrash.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/singletable/PaperTrash.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/singletable/PaperTrash.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/singletable/Rock.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Rock.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/singletable/Rock.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Rock.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/singletable/Trash.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Trash.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/singletable/Trash.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Trash.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/union/Document.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/union/Document.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/union/Document.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/union/Document.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/union/File.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/union/File.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/union/File.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/union/File.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/union/Folder.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/union/Folder.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/union/Folder.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/union/Folder.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/union/SubclassTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/union/SubclassTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/union/SubclassTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/union/SubclassTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/union/SymbolicLink.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/union/SymbolicLink.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/union/SymbolicLink.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/union/SymbolicLink.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/interfaces/Contact.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/interfaces/Contact.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/interfaces/Contact.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/interfaces/Contact.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/interfaces/ContactImpl.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/interfaces/ContactImpl.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/interfaces/ContactImpl.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/interfaces/ContactImpl.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/interfaces/InterfacesTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/interfaces/InterfacesTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/interfaces/InterfacesTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/interfaces/InterfacesTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/interfaces/User.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/interfaces/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/interfaces/User.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/interfaces/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/interfaces/UserImpl.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/interfaces/UserImpl.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/interfaces/UserImpl.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/interfaces/UserImpl.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/A.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/join/A.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/A.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/join/A.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/B.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/join/B.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/B.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/join/B.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/C.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/join/C.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/C.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/join/C.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/Cat.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/join/Cat.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/Cat.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/join/Cat.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/Death.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/join/Death.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/Death.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/join/Death.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/Dog.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/join/Dog.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/Dog.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/join/Dog.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/DogPk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/join/DogPk.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/DogPk.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/join/DogPk.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/JoinTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/join/JoinTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/JoinTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/join/JoinTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/Life.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/join/Life.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/Life.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/join/Life.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/SysGroupsOrm.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/join/SysGroupsOrm.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/SysGroupsOrm.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/join/SysGroupsOrm.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/SysUserOrm.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/join/SysUserOrm.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/join/SysUserOrm.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/join/SysUserOrm.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/loader/LoaderTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/loader/LoaderTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/loader/Player.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/loader/Player.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/loader/Player.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/loader/Player.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/loader/Team.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/loader/Team.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/loader/Team.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/loader/Team.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/AbstractBook.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/AbstractBook.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/AbstractBook.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/AbstractBook.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/AbstractCompiledCode.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/AbstractCompiledCode.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/AbstractCompiledCode.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/AbstractCompiledCode.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/AbstractLobTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/AbstractLobTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/AbstractLobTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/AbstractLobTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/Book.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/Book.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/Book.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/Book.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/CharacterArrayTextType.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/CharacterArrayTextType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/CharacterArrayTextType.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/CharacterArrayTextType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/CompiledCode.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/CompiledCode.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/CompiledCode.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/CompiledCode.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/Dog.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/Dog.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/Dog.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/Dog.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/Editor.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/Editor.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/Editor.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/Editor.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/ImageHolder.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/ImageHolder.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/ImageHolder.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/ImageHolder.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/ImageTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/ImageTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/ImageTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/ImageTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/LobTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/LobTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/LobTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/LobTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/LongStringHolder.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/LongStringHolder.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/LongStringHolder.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/LongStringHolder.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/MaterializedBlobEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/MaterializedBlobEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/MaterializedBlobEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/MaterializedBlobEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/MaterializedBlobTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/MaterializedBlobTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/MaterializedBlobTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/MaterializedBlobTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/PrimitiveCharacterArrayTextType.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/PrimitiveCharacterArrayTextType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/PrimitiveCharacterArrayTextType.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/PrimitiveCharacterArrayTextType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/SerializableToImageType.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/SerializableToImageType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/SerializableToImageType.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/SerializableToImageType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/TextTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/TextTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/TextTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/TextTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/VersionedBook.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/VersionedBook.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/VersionedBook.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/VersionedBook.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/VersionedCompiledCode.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/VersionedCompiledCode.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/VersionedCompiledCode.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/VersionedCompiledCode.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/VersionedLobTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/VersionedLobTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/VersionedLobTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/VersionedLobTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/WrappedImageType.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/WrappedImageType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/WrappedImageType.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/WrappedImageType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/package-info.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/package-info.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/lob/package-info.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/lob/package-info.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Building.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Building.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Building.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Building.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/BuildingCompany.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/BuildingCompany.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/BuildingCompany.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/BuildingCompany.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Cat.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Cat.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Cat.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Cat.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/CatPk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/CatPk.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/CatPk.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/CatPk.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/City.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/City.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/City.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/City.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Company.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Company.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Company.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Company.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/ContactInfo.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/ContactInfo.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/ContactInfo.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/ContactInfo.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Contractor.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Contractor.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Contractor.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Contractor.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Employer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Employer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Employer.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Employer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Friend.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Friend.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Friend.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Friend.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Group.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Group.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Group.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Group.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Inspector.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Inspector.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Inspector.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Inspector.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/InspectorPrefixes.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/InspectorPrefixes.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/InspectorPrefixes.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/InspectorPrefixes.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/JobInfo.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/JobInfo.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/JobInfo.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/JobInfo.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/KnownClient.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/KnownClient.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/KnownClient.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/KnownClient.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Man.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Man.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Man.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Man.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/ManPk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/ManPk.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/ManPk.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/ManPk.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/ManyToManyMaxFetchDepth0Test.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyMaxFetchDepth0Test.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/ManyToManyMaxFetchDepth0Test.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyMaxFetchDepth0Test.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Permission.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Permission.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Permission.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Permission.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/PhoneNumber.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/PhoneNumber.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/PhoneNumber.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/PhoneNumber.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/ProgramManager.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/ProgramManager.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/ProgramManager.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/ProgramManager.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Store.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Store.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Store.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Store.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Supplier.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Supplier.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Supplier.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Supplier.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Woman.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Woman.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Woman.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Woman.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/WomanPk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/WomanPk.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/WomanPk.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/WomanPk.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Zone.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Zone.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Zone.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Zone.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/BiggestForest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/BiggestForest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/BiggestForest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/BiggestForest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Car.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Car.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Car.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Car.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Carz.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Carz.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Carz.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Carz.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Child.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Child.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Child.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Child.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Color.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Color.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Color.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Color.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Deal.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Deal.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Deal.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Deal.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/DistrictUser.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/DistrictUser.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/DistrictUser.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/DistrictUser.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/ForestType.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/ForestType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/ForestType.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/ForestType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Frame.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Frame.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Frame.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Frame.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Lens.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Lens.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Lens.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Lens.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Lotz.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Lotz.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Lotz.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Lotz.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/LotzPK.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/LotzPK.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/LotzPK.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/LotzPK.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/ManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/ManyToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Node.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Node.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Node.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Node.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/NodePk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/NodePk.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/NodePk.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/NodePk.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Order.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Order.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Order.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Order.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/OrderLine.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/OrderLine.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/OrderLine.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/OrderLine.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Parent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/Parent.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/Parent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/ParentPk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/ParentPk.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/ParentPk.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/ParentPk.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/TreeType.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/TreeType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/TreeType.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/TreeType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/User.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/User.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/UserPK.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/UserPK.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/UserPK.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/UserPK.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/GenericObject.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/GenericObject.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/GenericObject.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/GenericObject.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Item.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Item.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Item.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Item.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Vendor.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Vendor.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Vendor.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Vendor.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ZItemCost.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ZItemCost.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ZItemCost.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ZItemCost.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Company.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Company.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Company.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Company.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Contract.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Contract.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Contract.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Contract.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/ContractId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ContractId.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/ContractId.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ContractId.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/FoodItem.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/FoodItem.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/FoodItem.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/FoodItem.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Language.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Language.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Language.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Language.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Manufacturer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Manufacturer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Manufacturer.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Manufacturer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/ManufacturerId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManufacturerId.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/ManufacturerId.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManufacturerId.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Menu.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Menu.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Menu.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Menu.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Message.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Message.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Message.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Message.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Model.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Model.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Model.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Model.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/ModelId.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ModelId.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/ModelId.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ModelId.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Product.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Product.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/Product.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/Product.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/ProductSqlServer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ProductSqlServer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytoonewithformula/ProductSqlServer.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ProductSqlServer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/Account.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/Account.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/Account.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/Account.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/AccountBase.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/AccountBase.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/AccountBase.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/AccountBase.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/IntermediateMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/IntermediateMappedSuperclassTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/IntermediateMappedSuperclassTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/IntermediateMappedSuperclassTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/SavingsAccount.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/SavingsAccount.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/SavingsAccount.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/SavingsAccount.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/SavingsAccountBase.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/SavingsAccountBase.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/SavingsAccountBase.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/mappedsuperclass/intermediate/SavingsAccountBase.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/A.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/A.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/A.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/A.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/Citizen.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/Citizen.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/Citizen.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/Citizen.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/D.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/D.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/D.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/D.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/NaturalIdOnManyToOne.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnManyToOne.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/NaturalIdOnManyToOne.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnManyToOne.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/State.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/State.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/State.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/State.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/notfound/Coin.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/Coin.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/notfound/Coin.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/Coin.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/notfound/Currency.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/Currency.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/notfound/Currency.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/Currency.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/notfound/NotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/NotFoundTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/notfound/NotFoundTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/notfound/NotFoundTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Child.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Child.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Child.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Child.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/City.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/City.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/City.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/City.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Manufacturer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Manufacturer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Manufacturer.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Manufacturer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Model.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Model.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Model.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Model.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Monkey.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Monkey.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Monkey.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Monkey.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Order.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Order.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Order.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Order.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/OrderByTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/OrderByTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/OrderID.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderID.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/OrderID.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderID.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/OrderItem.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderItem.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/OrderItem.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderItem.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/OrderItemID.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderItemID.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/OrderItemID.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderItemID.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Organisation.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Organisation.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Organisation.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Organisation.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/OrganisationUser.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrganisationUser.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/OrganisationUser.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrganisationUser.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Parent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Parent.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Parent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/ParentPk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/ParentPk.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/ParentPk.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/ParentPk.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/PoliticalParty.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/PoliticalParty.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/PoliticalParty.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/PoliticalParty.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Politician.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Politician.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Politician.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Politician.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Soldier.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Soldier.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Soldier.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Soldier.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Street.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Street.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Street.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Street.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Tiger.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Tiger.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Tiger.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Tiger.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Trainer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Trainer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Trainer.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Trainer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Troop.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Troop.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetomany/Troop.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Troop.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/OptionalOneToOneMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OptionalOneToOneMappedByTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/OptionalOneToOneMappedByTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OptionalOneToOneMappedByTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/OptionalOneToOnePKJCTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OptionalOneToOnePKJCTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/OptionalOneToOnePKJCTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OptionalOneToOnePKJCTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/hhh4851/BaseEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/BaseEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/hhh4851/BaseEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/BaseEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/hhh4851/Device.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Device.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/hhh4851/Device.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Device.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/DeviceGroupConfig.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/hhh4851/HHH4851Test.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/HHH4851Test.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/hhh4851/HHH4851Test.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/HHH4851Test.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/hhh4851/ManagedDevice.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/ManagedDevice.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/hhh4851/ManagedDevice.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/ManagedDevice.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/hhh4851/Owner.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Owner.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/hhh4851/Owner.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Owner.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/Addr.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/override/Addr.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/Addr.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/override/Addr.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/Address.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/override/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/override/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/AssociationOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/override/AssociationOverrideTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/AssociationOverrideTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/override/AssociationOverrideTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/AttributeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/override/AttributeOverrideTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/AttributeOverrideTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/override/AttributeOverrideTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/ContactInfo.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/override/ContactInfo.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/ContactInfo.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/override/ContactInfo.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/override/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/override/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/Location.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/override/Location.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/Location.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/override/Location.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/Move.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/override/Move.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/Move.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/override/Move.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/PhoneNumber.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/override/PhoneNumber.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/PhoneNumber.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/override/PhoneNumber.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/PropertyInfo.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/override/PropertyInfo.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/PropertyInfo.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/override/PropertyInfo.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/PropertyRecord.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/override/PropertyRecord.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/PropertyRecord.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/override/PropertyRecord.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/SocialSite.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/override/SocialSite.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/SocialSite.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/override/SocialSite.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/SocialTouchPoints.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/override/SocialTouchPoints.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/SocialTouchPoints.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/override/SocialTouchPoints.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/Trip.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/override/Trip.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/override/Trip.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/override/Trip.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/persister/Card.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/persister/Card.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/persister/Card.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/persister/Card.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/persister/CollectionPersister.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/persister/CollectionPersister.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/persister/CollectionPersister.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/persister/CollectionPersister.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/persister/Deck.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/persister/Deck.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/persister/Deck.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/persister/Deck.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/persister/EntityPersister.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/persister/EntityPersister.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/persister/EntityPersister.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/persister/EntityPersister.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/persister/PersisterTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/persister/PersisterTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/persister/PersisterTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/persister/PersisterTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/polymorphism/Car.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/polymorphism/Car.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/polymorphism/Car.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/polymorphism/Car.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/polymorphism/MovingThing.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/polymorphism/MovingThing.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/polymorphism/MovingThing.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/polymorphism/MovingThing.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/polymorphism/SportCar.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/polymorphism/SportCar.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/polymorphism/SportCar.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/polymorphism/SportCar.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/AllTables.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/AllTables.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/AllTables.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/query/AllTables.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/Area.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Area.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/Area.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/query/Area.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/Captain.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Captain.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/Captain.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/query/Captain.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/CasimirParticle.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/CasimirParticle.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/CasimirParticle.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/query/CasimirParticle.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/Chaos.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Chaos.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/Chaos.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/query/Chaos.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/Darkness.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Darkness.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/Darkness.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/query/Darkness.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/Dictionary.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Dictionary.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/Dictionary.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/query/Dictionary.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/Dimensions.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Dimensions.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/Dimensions.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/query/Dimensions.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/Identity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Identity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/Identity.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/query/Identity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/Mark.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Mark.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/Mark.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/query/Mark.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/Night.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Night.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/Night.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/query/Night.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/SpaceShip.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/SpaceShip.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/SpaceShip.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/query/SpaceShip.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/SynonymousDictionary.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/SynonymousDictionary.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/SynonymousDictionary.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/query/SynonymousDictionary.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/Twilight.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/Twilight.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/Twilight.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/query/Twilight.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/quote/Phone.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/quote/Phone.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/quote/Phone.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/quote/Phone.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/quote/QuoteGlobalTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/quote/QuoteGlobalTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/quote/QuoteGlobalTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/quote/QuoteGlobalTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/quote/QuoteTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/quote/QuoteTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/quote/Role.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/quote/Role.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/quote/Role.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/quote/Role.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/quote/User.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/quote/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/quote/User.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/quote/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/quote/resultsetmappings/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/MyEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/quote/resultsetmappings/MyEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/quote/resultsetmappings/MyEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/Bag.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Bag.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/Bag.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Bag.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/Clothes.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Clothes.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/Clothes.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Clothes.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/House.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/House.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/House.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/House.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/Inhabitant.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Inhabitant.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/Inhabitant.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Inhabitant.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/Item.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Item.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/Item.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Item.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/ItemCost.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ItemCost.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/ItemCost.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ItemCost.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/Luggage.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Luggage.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/Luggage.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Luggage.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/Postman.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Postman.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/Postman.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Postman.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/Rambler.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Rambler.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/Rambler.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Rambler.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/Vendor.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Vendor.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/Vendor.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Vendor.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/WarehouseItem.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/WarehouseItem.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/referencedcolumnname/WarehouseItem.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/referencedcolumnname/WarehouseItem.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/strategy/Location.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/strategy/Location.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/strategy/Location.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/strategy/Location.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/strategy/Storm.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/strategy/Storm.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/strategy/Storm.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/strategy/Storm.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/strategy/StrategyTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/strategy/StrategyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/strategy/StrategyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/strategy/StrategyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/subselect/Bid.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/subselect/Bid.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/subselect/Bid.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/subselect/Bid.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/subselect/HighestBid.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/subselect/HighestBid.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/subselect/HighestBid.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/subselect/HighestBid.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/subselect/Item.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/subselect/Item.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/subselect/Item.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/subselect/Item.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/subselect/SubselectTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/subselect/SubselectTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/subselect/SubselectTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/subselect/SubselectTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/tableperclass/Component.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/tableperclass/Component.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/tableperclass/Component.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/tableperclass/Component.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/tableperclass/Machine.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/tableperclass/Machine.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/tableperclass/Machine.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/tableperclass/Machine.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/tableperclass/Product.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/tableperclass/Product.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/tableperclass/Product.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/tableperclass/Product.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/tableperclass/Robot.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/tableperclass/Robot.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/tableperclass/Robot.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/tableperclass/Robot.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/tableperclass/T800.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/tableperclass/T800.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/tableperclass/T800.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/tableperclass/T800.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/target/Brand.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/target/Brand.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/target/Brand.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/target/Brand.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/target/Luggage.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/target/Luggage.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/target/Luggage.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/target/Luggage.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/target/LuggageImpl.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/target/LuggageImpl.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/target/Owner.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/target/Owner.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/target/Owner.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/target/Owner.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/target/OwnerImpl.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/target/OwnerImpl.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/target/OwnerImpl.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/target/OwnerImpl.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/target/Size.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/target/Size.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/target/Size.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/target/Size.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/target/SizeImpl.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/target/SizeImpl.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/target/SizeImpl.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/target/SizeImpl.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/target/TargetTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/target/TargetTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/target/TargetTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/target/TargetTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/tuplizer/Country.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/tuplizer/Country.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/tuplizer/Country.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/tuplizer/Country.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/tuplizer/Cuisine.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/tuplizer/Cuisine.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/tuplizer/Cuisine.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/tuplizer/Cuisine.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/tuplizer/DataProxyHandler.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/tuplizer/DataProxyHandler.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/tuplizer/DataProxyHandler.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/tuplizer/DataProxyHandler.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/tuplizer/DynamicComponentTuplizer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicComponentTuplizer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/tuplizer/DynamicComponentTuplizer.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicComponentTuplizer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/tuplizer/DynamicEntityTuplizer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicEntityTuplizer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/tuplizer/DynamicEntityTuplizer.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicEntityTuplizer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/tuplizer/DynamicInstantiator.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicInstantiator.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/tuplizer/DynamicInstantiator.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicInstantiator.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/tuplizer/EntityNameInterceptor.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/tuplizer/EntityNameInterceptor.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/tuplizer/EntityNameInterceptor.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/tuplizer/EntityNameInterceptor.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/tuplizer/ProxyHelper.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/tuplizer/ProxyHelper.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/tuplizer/ProxyHelper.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/tuplizer/ProxyHelper.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/type/Dvd.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/type/Dvd.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/type/Dvd.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/type/Dvd.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/type/MyOid.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/type/MyOid.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/type/MyOid.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/type/MyOid.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/type/MyOidGenerator.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/type/MyOidGenerator.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/type/MyOidGenerator.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/type/MyOidGenerator.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/type/MyOidType.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/type/MyOidType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/type/MyOidType.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/type/MyOidType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/type/TypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/type/TypeTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/type/TypeTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/type/TypeTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/uniqueconstraint/Building.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/Building.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/uniqueconstraint/Building.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/Building.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/uniqueconstraint/House.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/House.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/uniqueconstraint/House.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/House.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/uniqueconstraint/Room.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/Room.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/uniqueconstraint/Room.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/Room.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/Antenna.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/Antenna.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/Antenna.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/various/Antenna.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/Conductor.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/Conductor.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/Conductor.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/various/Conductor.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/DBTimestamped.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/DBTimestamped.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/DBTimestamped.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/various/DBTimestamped.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/GeneratedTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/GeneratedTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/IndexTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/IndexTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/IndexTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/various/IndexTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/OptimisticLockAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/OptimisticLockAnnotationTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/OptimisticLockAnnotationTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/various/OptimisticLockAnnotationTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/ProfessionalAgreement.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/ProfessionalAgreement.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/ProfessionalAgreement.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/various/ProfessionalAgreement.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/TimestampTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/TimestampTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/TimestampTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/various/TimestampTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/Truck.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/Truck.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/Truck.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/various/Truck.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/VMTimestamped.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/VMTimestamped.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/VMTimestamped.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/various/VMTimestamped.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/Vehicule.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/Vehicule.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/Vehicule.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/various/Vehicule.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/readwriteexpression/ColumnTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/readwriteexpression/ColumnTransformerTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/readwriteexpression/ColumnTransformerTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/various/readwriteexpression/ColumnTransformerTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/readwriteexpression/Staff.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/readwriteexpression/Staff.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/various/readwriteexpression/Staff.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/various/readwriteexpression/Staff.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/CarModel.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/CarModel.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/CarModel.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/CarModel.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Company.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Company.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Company.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Company.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Entity1.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity1.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Entity1.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity1.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Entity2.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity2.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Entity2.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity2.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Entity3.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity3.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Entity3.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity3.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Light.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Light.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Light.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Light.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Lighter.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Lighter.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Lighter.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Lighter.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Model.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Model.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Model.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Model.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/VicePresident.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/VicePresident.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/VicePresident.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/VicePresident.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/A.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/A.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/A.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/A.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/AImpl.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/AImpl.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/AImpl.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/AImpl.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/B.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/B.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/B.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/B.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/BImpl.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/BImpl.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/BImpl.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/BImpl.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/CloudType.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/CloudType.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/CloudType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/Government.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/Government.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/Government.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/PrimeMinister.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/PrimeMinister.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/PrimeMinister.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/PrimeMinister.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/Sky.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/Sky.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/Sky.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/Sky.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/Z.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/Z.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/Z.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/Z.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/ZImpl.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/ZImpl.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/hbm/ZImpl.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/xml/hbm/ZImpl.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/any/Address.java b/hibernate-core/src/test/java/org/hibernate/test/any/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/any/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/any/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/any/AnyTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/any/AnyTypeTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/any/AnyTypeTest.java rename to hibernate-core/src/test/java/org/hibernate/test/any/AnyTypeTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/any/ComplexPropertyValue.java b/hibernate-core/src/test/java/org/hibernate/test/any/ComplexPropertyValue.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/any/ComplexPropertyValue.java rename to hibernate-core/src/test/java/org/hibernate/test/any/ComplexPropertyValue.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/any/IntegerPropertyValue.java b/hibernate-core/src/test/java/org/hibernate/test/any/IntegerPropertyValue.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/any/IntegerPropertyValue.java rename to hibernate-core/src/test/java/org/hibernate/test/any/IntegerPropertyValue.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/any/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/any/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/any/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/any/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/any/Person.java b/hibernate-core/src/test/java/org/hibernate/test/any/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/any/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/any/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/any/Properties.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/any/Properties.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/any/Properties.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/any/Properties.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/any/PropertySet.java b/hibernate-core/src/test/java/org/hibernate/test/any/PropertySet.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/any/PropertySet.java rename to hibernate-core/src/test/java/org/hibernate/test/any/PropertySet.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/any/PropertyValue.java b/hibernate-core/src/test/java/org/hibernate/test/any/PropertyValue.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/any/PropertyValue.java rename to hibernate-core/src/test/java/org/hibernate/test/any/PropertyValue.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/any/StringPropertyValue.java b/hibernate-core/src/test/java/org/hibernate/test/any/StringPropertyValue.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/any/StringPropertyValue.java rename to hibernate-core/src/test/java/org/hibernate/test/any/StringPropertyValue.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/array/A.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/array/A.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/array/A.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/array/A.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/array/A.java b/hibernate-core/src/test/java/org/hibernate/test/array/A.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/array/A.java rename to hibernate-core/src/test/java/org/hibernate/test/array/A.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/array/ArrayTest.java b/hibernate-core/src/test/java/org/hibernate/test/array/ArrayTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/array/ArrayTest.java rename to hibernate-core/src/test/java/org/hibernate/test/array/ArrayTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/array/B.java b/hibernate-core/src/test/java/org/hibernate/test/array/B.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/array/B.java rename to hibernate-core/src/test/java/org/hibernate/test/array/B.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/batch/BatchTest.java b/hibernate-core/src/test/java/org/hibernate/test/batch/BatchTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/batch/BatchTest.java rename to hibernate-core/src/test/java/org/hibernate/test/batch/BatchTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/batch/DataPoint.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/batch/DataPoint.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/batch/DataPoint.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/batch/DataPoint.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/batch/DataPoint.java b/hibernate-core/src/test/java/org/hibernate/test/batch/DataPoint.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/batch/DataPoint.java rename to hibernate-core/src/test/java/org/hibernate/test/batch/DataPoint.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/batchfetch/BatchFetchTest.java b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/batchfetch/BatchFetchTest.java rename to hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/batchfetch/Model.java b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/Model.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/batchfetch/Model.java rename to hibernate-core/src/test/java/org/hibernate/test/batchfetch/Model.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/batchfetch/ProductLine.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/ProductLine.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/batchfetch/ProductLine.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/batchfetch/ProductLine.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/batchfetch/ProductLine.java b/hibernate-core/src/test/java/org/hibernate/test/batchfetch/ProductLine.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/batchfetch/ProductLine.java rename to hibernate-core/src/test/java/org/hibernate/test/batchfetch/ProductLine.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/bidi/Auction.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/bidi/Auction.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/bidi/Auction.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/bidi/Auction.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/bidi/Auction.java b/hibernate-core/src/test/java/org/hibernate/test/bidi/Auction.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/bidi/Auction.java rename to hibernate-core/src/test/java/org/hibernate/test/bidi/Auction.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/bidi/Auction2.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/bidi/Auction2.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/bidi/Auction2.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/bidi/Auction2.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/bidi/AuctionTest.java b/hibernate-core/src/test/java/org/hibernate/test/bidi/AuctionTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/bidi/AuctionTest.java rename to hibernate-core/src/test/java/org/hibernate/test/bidi/AuctionTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/bidi/AuctionTest2.java b/hibernate-core/src/test/java/org/hibernate/test/bidi/AuctionTest2.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/bidi/AuctionTest2.java rename to hibernate-core/src/test/java/org/hibernate/test/bidi/AuctionTest2.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/bidi/Bid.java b/hibernate-core/src/test/java/org/hibernate/test/bidi/Bid.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/bidi/Bid.java rename to hibernate-core/src/test/java/org/hibernate/test/bidi/Bid.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cache/CacheableItem.java b/hibernate-core/src/test/java/org/hibernate/test/cache/CacheableItem.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cache/CacheableItem.java rename to hibernate-core/src/test/java/org/hibernate/test/cache/CacheableItem.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cache/InsertedDataTest.java b/hibernate-core/src/test/java/org/hibernate/test/cache/InsertedDataTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cache/InsertedDataTest.java rename to hibernate-core/src/test/java/org/hibernate/test/cache/InsertedDataTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/A.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/A.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/A.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/A.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/BidirectionalOneToManyCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/BidirectionalOneToManyCascadeTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/BidirectionalOneToManyCascadeTest.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/BidirectionalOneToManyCascadeTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/CascadeTestWithAssignedParentIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/CascadeTestWithAssignedParentIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/CascadeTestWithAssignedParentIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/CascadeTestWithAssignedParentIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/Child.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cascade/Child.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/Child.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/cascade/Child.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/Child.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/Child.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/Child.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/Child.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/ChildForParentWithAssignedId.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cascade/ChildForParentWithAssignedId.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/ChildForParentWithAssignedId.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/cascade/ChildForParentWithAssignedId.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/DeleteOrphanChild.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cascade/DeleteOrphanChild.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/DeleteOrphanChild.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/cascade/DeleteOrphanChild.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/DeleteOrphanChild.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/DeleteOrphanChild.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/DeleteOrphanChild.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/DeleteOrphanChild.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/G.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/G.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/G.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/G.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/H.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/H.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/H.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/H.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/Job.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cascade/Job.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/Job.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/cascade/Job.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/Job.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/Job.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/Job.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/Job.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/JobBatch.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cascade/JobBatch.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/JobBatch.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/cascade/JobBatch.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/JobBatch.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/JobBatch.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/JobBatch.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/JobBatch.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/MultiPathCascade.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cascade/MultiPathCascade.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/MultiPathCascade.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/cascade/MultiPathCascade.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/MultiPathCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/MultiPathCascadeTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/MultiPathCascadeTest.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/MultiPathCascadeTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/Parent.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cascade/Parent.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/Parent.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/cascade/Parent.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/Parent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/Parent.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/Parent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/ParentWithAssignedId.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cascade/ParentWithAssignedId.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/ParentWithAssignedId.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/cascade/ParentWithAssignedId.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/RefreshTest.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/RefreshTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/RefreshTest.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/RefreshTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/CascadeMergeToChildBeforeParent.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cascade/circle/CascadeMergeToChildBeforeParent.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/CascadeMergeToChildBeforeParent.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/cascade/circle/CascadeMergeToChildBeforeParent.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascade.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascade.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascade.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascade.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeTest.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/Node.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/circle/Node.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/Node.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/circle/Node.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/Route.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/circle/Route.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/Route.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/circle/Route.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/Tour.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/circle/Tour.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/Tour.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/circle/Tour.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/Transport.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/circle/Transport.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/Transport.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/circle/Transport.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/Vehicle.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/circle/Vehicle.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/Vehicle.java rename to hibernate-core/src/test/java/org/hibernate/test/cascade/circle/Vehicle.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cid/CompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/cid/CompositeIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cid/CompositeIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/cid/CompositeIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cid/CompositeIdWithGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/test/cid/CompositeIdWithGeneratorTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cid/CompositeIdWithGeneratorTest.java rename to hibernate-core/src/test/java/org/hibernate/test/cid/CompositeIdWithGeneratorTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cid/Customer.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cid/Customer.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cid/Customer.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/cid/Customer.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cid/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/cid/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cid/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/cid/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cid/LineItem.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cid/LineItem.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cid/LineItem.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/cid/LineItem.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cid/LineItem.java b/hibernate-core/src/test/java/org/hibernate/test/cid/LineItem.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cid/LineItem.java rename to hibernate-core/src/test/java/org/hibernate/test/cid/LineItem.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cid/Order.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cid/Order.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cid/Order.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/cid/Order.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cid/Order.java b/hibernate-core/src/test/java/org/hibernate/test/cid/Order.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cid/Order.java rename to hibernate-core/src/test/java/org/hibernate/test/cid/Order.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cid/Product.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cid/Product.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cid/Product.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/cid/Product.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cid/Product.java b/hibernate-core/src/test/java/org/hibernate/test/cid/Product.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cid/Product.java rename to hibernate-core/src/test/java/org/hibernate/test/cid/Product.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cid/PurchaseDetail.java b/hibernate-core/src/test/java/org/hibernate/test/cid/PurchaseDetail.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cid/PurchaseDetail.java rename to hibernate-core/src/test/java/org/hibernate/test/cid/PurchaseDetail.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cid/PurchaseRecord.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cid/PurchaseRecord.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cid/PurchaseRecord.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/cid/PurchaseRecord.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cid/PurchaseRecord.java b/hibernate-core/src/test/java/org/hibernate/test/cid/PurchaseRecord.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cid/PurchaseRecord.java rename to hibernate-core/src/test/java/org/hibernate/test/cid/PurchaseRecord.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cid/PurchaseRecordIdGenerator.java b/hibernate-core/src/test/java/org/hibernate/test/cid/PurchaseRecordIdGenerator.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cid/PurchaseRecordIdGenerator.java rename to hibernate-core/src/test/java/org/hibernate/test/cid/PurchaseRecordIdGenerator.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/backref/map/compkey/BackrefCompositeMapKeyTest.java b/hibernate-core/src/test/java/org/hibernate/test/collection/backref/map/compkey/BackrefCompositeMapKeyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/backref/map/compkey/BackrefCompositeMapKeyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/backref/map/compkey/BackrefCompositeMapKeyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/backref/map/compkey/MapKey.java b/hibernate-core/src/test/java/org/hibernate/test/collection/backref/map/compkey/MapKey.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/backref/map/compkey/MapKey.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/backref/map/compkey/MapKey.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/backref/map/compkey/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/collection/backref/map/compkey/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/backref/map/compkey/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/collection/backref/map/compkey/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/backref/map/compkey/Part.java b/hibernate-core/src/test/java/org/hibernate/test/collection/backref/map/compkey/Part.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/backref/map/compkey/Part.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/backref/map/compkey/Part.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/backref/map/compkey/Product.java b/hibernate-core/src/test/java/org/hibernate/test/collection/backref/map/compkey/Product.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/backref/map/compkey/Product.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/backref/map/compkey/Product.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/bag/BagOwner.java b/hibernate-core/src/test/java/org/hibernate/test/collection/bag/BagOwner.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/bag/BagOwner.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/bag/BagOwner.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/bag/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/collection/bag/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/bag/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/collection/bag/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/bag/PersistentBagTest.java b/hibernate-core/src/test/java/org/hibernate/test/collection/bag/PersistentBagTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/bag/PersistentBagTest.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/bag/PersistentBagTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/Email.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/Email.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/Email.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/Email.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/IMyList.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/IMyList.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/IMyList.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/IMyList.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/MyList.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/MyList.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/MyList.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/MyList.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/MyListType.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/MyListType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/MyListType.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/MyListType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/PersistentMyList.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/PersistentMyList.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/PersistentMyList.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/PersistentMyList.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/User.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/User.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeAnnotationsVariantTest.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeAnnotationsVariantTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeAnnotationsVariantTest.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeAnnotationsVariantTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeHbmVariantTest.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeHbmVariantTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeHbmVariantTest.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeHbmVariantTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeTest.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/UserPermissions.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/UserPermissions.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/UserPermissions.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/collection/custom/basic/UserPermissions.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/DefaultableList.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/DefaultableList.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/DefaultableList.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/DefaultableList.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/DefaultableListImpl.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/DefaultableListImpl.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/DefaultableListImpl.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/DefaultableListImpl.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/DefaultableListType.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/DefaultableListType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/DefaultableListType.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/DefaultableListType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/Entity.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/Entity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/Entity.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/Entity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/Mapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/Mapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/Mapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/Mapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/ParameterizedUserCollectionTypeAnnotationsVariantTest.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/ParameterizedUserCollectionTypeAnnotationsVariantTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/ParameterizedUserCollectionTypeAnnotationsVariantTest.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/ParameterizedUserCollectionTypeAnnotationsVariantTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/ParameterizedUserCollectionTypeHbmVariantTest.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/ParameterizedUserCollectionTypeHbmVariantTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/ParameterizedUserCollectionTypeHbmVariantTest.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/ParameterizedUserCollectionTypeHbmVariantTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/ParameterizedUserCollectionTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/ParameterizedUserCollectionTypeTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/ParameterizedUserCollectionTypeTest.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/ParameterizedUserCollectionTypeTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/PersistentDefaultableList.java b/hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/PersistentDefaultableList.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/PersistentDefaultableList.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/custom/parameterized/PersistentDefaultableList.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/idbag/IdbagOwner.java b/hibernate-core/src/test/java/org/hibernate/test/collection/idbag/IdbagOwner.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/idbag/IdbagOwner.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/idbag/IdbagOwner.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/idbag/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/collection/idbag/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/idbag/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/collection/idbag/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/idbag/PersistentIdBagTest.java b/hibernate-core/src/test/java/org/hibernate/test/collection/idbag/PersistentIdBagTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/idbag/PersistentIdBagTest.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/idbag/PersistentIdBagTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/list/ListOwner.java b/hibernate-core/src/test/java/org/hibernate/test/collection/list/ListOwner.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/list/ListOwner.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/list/ListOwner.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/list/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/collection/list/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/list/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/collection/list/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/list/PersistentListTest.java b/hibernate-core/src/test/java/org/hibernate/test/collection/list/PersistentListTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/list/PersistentListTest.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/list/PersistentListTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/map/Child.java b/hibernate-core/src/test/java/org/hibernate/test/collection/map/Child.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/map/Child.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/map/Child.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/map/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/collection/map/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/map/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/collection/map/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/map/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/collection/map/Parent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/map/Parent.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/map/Parent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/map/PersistentMapTest.java b/hibernate-core/src/test/java/org/hibernate/test/collection/map/PersistentMapTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/map/PersistentMapTest.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/map/PersistentMapTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/original/Animal.java b/hibernate-core/src/test/java/org/hibernate/test/collection/original/Animal.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/original/Animal.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/original/Animal.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/original/CollectionTest.java b/hibernate-core/src/test/java/org/hibernate/test/collection/original/CollectionTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/original/CollectionTest.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/original/CollectionTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/original/Email.java b/hibernate-core/src/test/java/org/hibernate/test/collection/original/Email.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/original/Email.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/original/Email.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/original/Mammal.java b/hibernate-core/src/test/java/org/hibernate/test/collection/original/Mammal.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/original/Mammal.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/original/Mammal.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/original/Permission.java b/hibernate-core/src/test/java/org/hibernate/test/collection/original/Permission.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/original/Permission.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/original/Permission.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/original/User.java b/hibernate-core/src/test/java/org/hibernate/test/collection/original/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/original/User.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/original/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/original/UserPermissions.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/collection/original/UserPermissions.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/original/UserPermissions.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/collection/original/UserPermissions.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/original/Zoo.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/collection/original/Zoo.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/original/Zoo.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/collection/original/Zoo.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/original/Zoo.java b/hibernate-core/src/test/java/org/hibernate/test/collection/original/Zoo.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/original/Zoo.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/original/Zoo.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/set/Child.java b/hibernate-core/src/test/java/org/hibernate/test/collection/set/Child.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/set/Child.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/set/Child.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/set/Container.java b/hibernate-core/src/test/java/org/hibernate/test/collection/set/Container.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/set/Container.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/set/Container.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/set/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/collection/set/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/set/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/collection/set/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/set/MappingsNonLazy.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/collection/set/MappingsNonLazy.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/set/MappingsNonLazy.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/collection/set/MappingsNonLazy.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/set/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/collection/set/Parent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/set/Parent.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/set/Parent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/set/PersistentSetNonLazyTest.java b/hibernate-core/src/test/java/org/hibernate/test/collection/set/PersistentSetNonLazyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/set/PersistentSetNonLazyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/set/PersistentSetNonLazyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/set/PersistentSetTest.java b/hibernate-core/src/test/java/org/hibernate/test/collection/set/PersistentSetTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/collection/set/PersistentSetTest.java rename to hibernate-core/src/test/java/org/hibernate/test/collection/set/PersistentSetTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/basic/ComponentTest.java b/hibernate-core/src/test/java/org/hibernate/test/component/basic/ComponentTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/component/basic/ComponentTest.java rename to hibernate-core/src/test/java/org/hibernate/test/component/basic/ComponentTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/basic/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/component/basic/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/component/basic/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/component/basic/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/basic/OptionalComponent.java b/hibernate-core/src/test/java/org/hibernate/test/component/basic/OptionalComponent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/component/basic/OptionalComponent.java rename to hibernate-core/src/test/java/org/hibernate/test/component/basic/OptionalComponent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/basic/Person.java b/hibernate-core/src/test/java/org/hibernate/test/component/basic/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/component/basic/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/component/basic/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/basic/User.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/component/basic/User.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/component/basic/User.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/component/basic/User.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/basic/User.java b/hibernate-core/src/test/java/org/hibernate/test/component/basic/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/component/basic/User.java rename to hibernate-core/src/test/java/org/hibernate/test/component/basic/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/basic2/ComponentJoinsTest.java b/hibernate-core/src/test/java/org/hibernate/test/component/basic2/ComponentJoinsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/component/basic2/ComponentJoinsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/component/basic2/ComponentJoinsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/basic2/Name.java b/hibernate-core/src/test/java/org/hibernate/test/component/basic2/Name.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/component/basic2/Name.java rename to hibernate-core/src/test/java/org/hibernate/test/component/basic2/Name.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/basic2/Person.java b/hibernate-core/src/test/java/org/hibernate/test/component/basic2/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/component/basic2/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/component/basic2/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/collection/CascadeToComponentCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/CascadeToComponentCollectionTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/collection/CascadeToComponentCollectionTest.java rename to hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/CascadeToComponentCollectionTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/collection/Definition.java b/hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/Definition.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/collection/Definition.java rename to hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/Definition.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/collection/LocalizedStrings.java b/hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/LocalizedStrings.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/collection/LocalizedStrings.java rename to hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/LocalizedStrings.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/collection/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/collection/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/collection/Value.java b/hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/Value.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/collection/Value.java rename to hibernate-core/src/test/java/org/hibernate/test/component/cascading/collection/Value.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/toone/Address.java b/hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/toone/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/toone/CascadeToComponentAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/CascadeToComponentAssociationTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/toone/CascadeToComponentAssociationTest.java rename to hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/CascadeToComponentAssociationTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/toone/Document.java b/hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/Document.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/toone/Document.java rename to hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/Document.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/toone/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/toone/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/toone/PersonalInfo.java b/hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/PersonalInfo.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/toone/PersonalInfo.java rename to hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/PersonalInfo.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/toone/User.java b/hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/component/cascading/toone/User.java rename to hibernate-core/src/test/java/org/hibernate/test/component/cascading/toone/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/compositeelement/Child.java b/hibernate-core/src/test/java/org/hibernate/test/compositeelement/Child.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/compositeelement/Child.java rename to hibernate-core/src/test/java/org/hibernate/test/compositeelement/Child.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/compositeelement/CompositeElementTest.java b/hibernate-core/src/test/java/org/hibernate/test/compositeelement/CompositeElementTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/compositeelement/CompositeElementTest.java rename to hibernate-core/src/test/java/org/hibernate/test/compositeelement/CompositeElementTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/compositeelement/Parent.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/compositeelement/Parent.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/compositeelement/Parent.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/compositeelement/Parent.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/compositeelement/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/compositeelement/Parent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/compositeelement/Parent.java rename to hibernate-core/src/test/java/org/hibernate/test/compositeelement/Parent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/AbstractFoo.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/AbstractFoo.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/AbstractFoo.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/AbstractFoo.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/Animal.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/criteria/Animal.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/Animal.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/criteria/Animal.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/Bar.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/Bar.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/Bar.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/Bar.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/CityState.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/CityState.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/CityState.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/CityState.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/Code.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/Code.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/Code.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/Code.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/ComplexJoinAliasTest.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/ComplexJoinAliasTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/ComplexJoinAliasTest.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/ComplexJoinAliasTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/Course.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/Course.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/Course.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/Course.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/CourseMeeting.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/CourseMeeting.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/CourseMeeting.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/CourseMeeting.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/CourseMeetingId.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/CourseMeetingId.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/CourseMeetingId.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/CourseMeetingId.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/CriteriaQueryTest.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/CriteriaQueryTest.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/Enrolment.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/criteria/Enrolment.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/Enrolment.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/criteria/Enrolment.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/Enrolment.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/Enrolment.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/Enrolment.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/Enrolment.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/Foo.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/criteria/Foo.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/Foo.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/criteria/Foo.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/GreatFoo.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/GreatFoo.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/GreatFoo.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/GreatFoo.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/LikeTest.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/LikeTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/LikeTest.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/LikeTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/ListActionRole.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/ListActionRole.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/ListActionRole.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/ListActionRole.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/LongInElementsTest.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/LongInElementsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/LongInElementsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/LongInElementsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/Man.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/Man.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/Man.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/Man.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/Order.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/criteria/Order.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/Order.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/criteria/Order.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/Order.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/Order.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/Order.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/Order.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/OrderLine.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/OrderLine.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/OrderLine.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/OrderLine.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/OuterJoinCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/OuterJoinCriteriaTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/OuterJoinCriteriaTest.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/OuterJoinCriteriaTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/criteria/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/criteria/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/Person.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/Role.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/Role.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/Role.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/Role.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/StringExpression.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/StringExpression.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/StringExpression.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/StringExpression.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/Student.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/Student.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/Student.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/Student.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/StudentAddress.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/StudentAddress.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/StudentAddress.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/StudentAddress.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/StudentDTO.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/StudentDTO.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/StudentDTO.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/StudentDTO.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/TestObject.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/criteria/TestObject.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/TestObject.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/criteria/TestObject.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/TestObject.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/TestObject.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/TestObject.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/TestObject.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/VersionedRecord.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/VersionedRecord.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/VersionedRecord.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/VersionedRecord.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/Woman.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/Woman.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/criteria/Woman.java rename to hibernate-core/src/test/java/org/hibernate/test/criteria/Woman.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cuk/Account.java b/hibernate-core/src/test/java/org/hibernate/test/cuk/Account.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cuk/Account.java rename to hibernate-core/src/test/java/org/hibernate/test/cuk/Account.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cuk/Address.java b/hibernate-core/src/test/java/org/hibernate/test/cuk/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cuk/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/cuk/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cuk/CompositePropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/test/cuk/CompositePropertyRefTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cuk/CompositePropertyRefTest.java rename to hibernate-core/src/test/java/org/hibernate/test/cuk/CompositePropertyRefTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cuk/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cuk/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cuk/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/cuk/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cuk/Person.java b/hibernate-core/src/test/java/org/hibernate/test/cuk/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cuk/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/cuk/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cut/CompositeUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/cut/CompositeUserTypeTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cut/CompositeUserTypeTest.java rename to hibernate-core/src/test/java/org/hibernate/test/cut/CompositeUserTypeTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cut/MonetoryAmount.java b/hibernate-core/src/test/java/org/hibernate/test/cut/MonetoryAmount.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cut/MonetoryAmount.java rename to hibernate-core/src/test/java/org/hibernate/test/cut/MonetoryAmount.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cut/MonetoryAmountUserType.java b/hibernate-core/src/test/java/org/hibernate/test/cut/MonetoryAmountUserType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cut/MonetoryAmountUserType.java rename to hibernate-core/src/test/java/org/hibernate/test/cut/MonetoryAmountUserType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cut/MutualFund.java b/hibernate-core/src/test/java/org/hibernate/test/cut/MutualFund.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cut/MutualFund.java rename to hibernate-core/src/test/java/org/hibernate/test/cut/MutualFund.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cut/Transaction.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cut/Transaction.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cut/Transaction.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/cut/Transaction.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cut/Transaction.java b/hibernate-core/src/test/java/org/hibernate/test/cut/Transaction.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cut/Transaction.java rename to hibernate-core/src/test/java/org/hibernate/test/cut/Transaction.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cut/types.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cut/types.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cut/types.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/cut/types.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/deletetransient/Address.java b/hibernate-core/src/test/java/org/hibernate/test/deletetransient/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/deletetransient/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/deletetransient/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/deletetransient/DeleteTransientEntityTest.java b/hibernate-core/src/test/java/org/hibernate/test/deletetransient/DeleteTransientEntityTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/deletetransient/DeleteTransientEntityTest.java rename to hibernate-core/src/test/java/org/hibernate/test/deletetransient/DeleteTransientEntityTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/deletetransient/Note.java b/hibernate-core/src/test/java/org/hibernate/test/deletetransient/Note.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/deletetransient/Note.java rename to hibernate-core/src/test/java/org/hibernate/test/deletetransient/Note.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/deletetransient/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/deletetransient/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/deletetransient/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/deletetransient/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/deletetransient/Person.java b/hibernate-core/src/test/java/org/hibernate/test/deletetransient/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/deletetransient/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/deletetransient/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/deletetransient/Suite.java b/hibernate-core/src/test/java/org/hibernate/test/deletetransient/Suite.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/deletetransient/Suite.java rename to hibernate-core/src/test/java/org/hibernate/test/deletetransient/Suite.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dialect/function/MySQLRoundFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/test/dialect/function/MySQLRoundFunctionTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dialect/function/MySQLRoundFunctionTest.java rename to hibernate-core/src/test/java/org/hibernate/test/dialect/function/MySQLRoundFunctionTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dialect/functional/Product2.java b/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/Product2.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dialect/functional/Product2.java rename to hibernate-core/src/test/java/org/hibernate/test/dialect/functional/Product2.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dialect/functional/SQLServerDialectTest.java b/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SQLServerDialectTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dialect/functional/SQLServerDialectTest.java rename to hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SQLServerDialectTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java b/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dialect/functional/cache/TestInterSystemsFunctionsClass.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/cache/TestInterSystemsFunctionsClass.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dialect/functional/cache/TestInterSystemsFunctionsClass.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/dialect/functional/cache/TestInterSystemsFunctionsClass.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dialect/functional/cache/TestInterSystemsFunctionsClass.java b/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/cache/TestInterSystemsFunctionsClass.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dialect/functional/cache/TestInterSystemsFunctionsClass.java rename to hibernate-core/src/test/java/org/hibernate/test/dialect/functional/cache/TestInterSystemsFunctionsClass.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/discriminator/Address.java b/hibernate-core/src/test/java/org/hibernate/test/discriminator/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/discriminator/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/discriminator/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/discriminator/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/discriminator/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/discriminator/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/discriminator/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/discriminator/DiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/test/discriminator/DiscriminatorTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/discriminator/DiscriminatorTest.java rename to hibernate-core/src/test/java/org/hibernate/test/discriminator/DiscriminatorTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/discriminator/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/discriminator/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/discriminator/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/discriminator/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/discriminator/PartTimeEmployee.java b/hibernate-core/src/test/java/org/hibernate/test/discriminator/PartTimeEmployee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/discriminator/PartTimeEmployee.java rename to hibernate-core/src/test/java/org/hibernate/test/discriminator/PartTimeEmployee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/discriminator/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/discriminator/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/discriminator/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/discriminator/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/discriminator/Person.java b/hibernate-core/src/test/java/org/hibernate/test/discriminator/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/discriminator/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/discriminator/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/discriminator/SimpleInheritance.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/discriminator/SimpleInheritance.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/discriminator/SimpleInheritance.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/discriminator/SimpleInheritance.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/discriminator/SimpleInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/test/discriminator/SimpleInheritanceTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/discriminator/SimpleInheritanceTest.java rename to hibernate-core/src/test/java/org/hibernate/test/discriminator/SimpleInheritanceTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/Address.java b/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/dynamicentity/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/Company.java b/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/Company.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/Company.java rename to hibernate-core/src/test/java/org/hibernate/test/dynamicentity/Company.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/dynamicentity/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/DataProxyHandler.java b/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/DataProxyHandler.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/DataProxyHandler.java rename to hibernate-core/src/test/java/org/hibernate/test/dynamicentity/DataProxyHandler.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/Person.java b/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/dynamicentity/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/ProxyHelper.java b/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/ProxyHelper.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/ProxyHelper.java rename to hibernate-core/src/test/java/org/hibernate/test/dynamicentity/ProxyHelper.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/interceptor/Customer.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/interceptor/Customer.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/interceptor/Customer.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/dynamicentity/interceptor/Customer.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/interceptor/InterceptorDynamicEntityTest.java b/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/interceptor/InterceptorDynamicEntityTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/interceptor/InterceptorDynamicEntityTest.java rename to hibernate-core/src/test/java/org/hibernate/test/dynamicentity/interceptor/InterceptorDynamicEntityTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/interceptor/ProxyInterceptor.java b/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/interceptor/ProxyInterceptor.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/interceptor/ProxyInterceptor.java rename to hibernate-core/src/test/java/org/hibernate/test/dynamicentity/interceptor/ProxyInterceptor.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/package.html b/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/package.html similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/package.html rename to hibernate-core/src/test/java/org/hibernate/test/dynamicentity/package.html diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/tuplizer/Customer.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer/Customer.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/tuplizer/Customer.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer/Customer.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/tuplizer/EntityNameInterceptor.java b/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer/EntityNameInterceptor.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/tuplizer/EntityNameInterceptor.java rename to hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer/EntityNameInterceptor.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/tuplizer/MyEntityInstantiator.java b/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer/MyEntityInstantiator.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/tuplizer/MyEntityInstantiator.java rename to hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer/MyEntityInstantiator.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/tuplizer/MyEntityTuplizer.java b/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer/MyEntityTuplizer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/tuplizer/MyEntityTuplizer.java rename to hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer/MyEntityTuplizer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/tuplizer/TuplizerDynamicEntityTest.java b/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer/TuplizerDynamicEntityTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/tuplizer/TuplizerDynamicEntityTest.java rename to hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer/TuplizerDynamicEntityTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/tuplizer2/Customer.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/Customer.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/tuplizer2/Customer.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/Customer.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/tuplizer2/ImprovedTuplizerDynamicEntityTest.java b/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/ImprovedTuplizerDynamicEntityTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/tuplizer2/ImprovedTuplizerDynamicEntityTest.java rename to hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/ImprovedTuplizerDynamicEntityTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/tuplizer2/MyEntityInstantiator.java b/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/MyEntityInstantiator.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/tuplizer2/MyEntityInstantiator.java rename to hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/MyEntityInstantiator.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/tuplizer2/MyEntityTuplizer.java b/hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/MyEntityTuplizer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dynamicentity/tuplizer2/MyEntityTuplizer.java rename to hibernate-core/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/MyEntityTuplizer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ecid/Course.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/ecid/Course.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ecid/Course.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/ecid/Course.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ecid/Course.java b/hibernate-core/src/test/java/org/hibernate/test/ecid/Course.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ecid/Course.java rename to hibernate-core/src/test/java/org/hibernate/test/ecid/Course.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ecid/EmbeddedCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/ecid/EmbeddedCompositeIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ecid/EmbeddedCompositeIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/ecid/EmbeddedCompositeIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ecid/UniversityCourse.java b/hibernate-core/src/test/java/org/hibernate/test/ecid/UniversityCourse.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ecid/UniversityCourse.java rename to hibernate-core/src/test/java/org/hibernate/test/ecid/UniversityCourse.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/entitymode/map/basic/DynamicClassTest.java b/hibernate-core/src/test/java/org/hibernate/test/entitymode/map/basic/DynamicClassTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/entitymode/map/basic/DynamicClassTest.java rename to hibernate-core/src/test/java/org/hibernate/test/entitymode/map/basic/DynamicClassTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/entitymode/map/basic/ProductLine.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/entitymode/map/basic/ProductLine.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/entitymode/map/basic/ProductLine.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/entitymode/map/basic/ProductLine.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/entitymode/map/subclass/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/entitymode/map/subclass/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/entitymode/map/subclass/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/entitymode/map/subclass/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java b/hibernate-core/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java rename to hibernate-core/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/entityname/Car.java b/hibernate-core/src/test/java/org/hibernate/test/entityname/Car.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/entityname/Car.java rename to hibernate-core/src/test/java/org/hibernate/test/entityname/Car.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/entityname/EntityNameFromSubClassTest.java b/hibernate-core/src/test/java/org/hibernate/test/entityname/EntityNameFromSubClassTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/entityname/EntityNameFromSubClassTest.java rename to hibernate-core/src/test/java/org/hibernate/test/entityname/EntityNameFromSubClassTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/entityname/Person.java b/hibernate-core/src/test/java/org/hibernate/test/entityname/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/entityname/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/entityname/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/entityname/Vehicle.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/entityname/Vehicle.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/entityname/Vehicle.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/entityname/Vehicle.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/entityname/Vehicle.java b/hibernate-core/src/test/java/org/hibernate/test/entityname/Vehicle.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/entityname/Vehicle.java rename to hibernate-core/src/test/java/org/hibernate/test/entityname/Vehicle.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/AbstractCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/AbstractCollectionEventTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/AbstractCollectionEventTest.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/AbstractCollectionEventTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/AbstractParentWithCollection.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/AbstractParentWithCollection.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/AbstractParentWithCollection.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/AbstractParentWithCollection.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/BrokenCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/BrokenCollectionEventTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/BrokenCollectionEventTest.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/BrokenCollectionEventTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/Child.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/Child.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/Child.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/Child.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/ChildEntity.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/ChildEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/ChildEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/ChildEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/ChildValue.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/ChildValue.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/ChildValue.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/ChildValue.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/CollectionListeners.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/CollectionListeners.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/CollectionListeners.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/CollectionListeners.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/Entity.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/Entity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/Entity.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/Entity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/ParentWithCollection.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/ParentWithCollection.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/ParentWithCollection.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/ParentWithCollection.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/AbstractAssociationCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/AbstractAssociationCollectionEventTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/AbstractAssociationCollectionEventTest.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/AbstractAssociationCollectionEventTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetCollectionEventTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetCollectionEventTest.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetCollectionEventTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetMapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetMapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetMapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetMapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetCollectionEventTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetCollectionEventTest.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetCollectionEventTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetMapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetMapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetMapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetMapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/ChildWithBidirectionalManyToMany.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/ChildWithBidirectionalManyToMany.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/ChildWithBidirectionalManyToMany.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/ChildWithBidirectionalManyToMany.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/ParentWithBidirectionalManyToMany.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/ParentWithBidirectionalManyToMany.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/ParentWithBidirectionalManyToMany.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/ParentWithBidirectionalManyToMany.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagCollectionEventTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagCollectionEventTest.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagCollectionEventTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagMapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagMapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagMapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagMapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassCollectionEventTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassCollectionEventTest.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassCollectionEventTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassMapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassMapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassMapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassMapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetCollectionEventTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetCollectionEventTest.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetCollectionEventTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetMapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetMapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetMapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetMapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/ChildWithManyToOne.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/ChildWithManyToOne.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/ChildWithManyToOne.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/ChildWithManyToOne.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToMany.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToMany.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToMany.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToMany.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToManySubclass.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToManySubclass.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToManySubclass.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/ParentWithBidirectionalOneToManySubclass.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/unidirectional/ParentWithCollectionOfEntities.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/ParentWithCollectionOfEntities.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/unidirectional/ParentWithCollectionOfEntities.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/ParentWithCollectionOfEntities.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/unidirectional/manytomany/UnidirectionalManyToManyBagCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/manytomany/UnidirectionalManyToManyBagCollectionEventTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/unidirectional/manytomany/UnidirectionalManyToManyBagCollectionEventTest.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/manytomany/UnidirectionalManyToManyBagCollectionEventTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/unidirectional/manytomany/UnidirectionalManyToManyBagMapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/manytomany/UnidirectionalManyToManyBagMapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/unidirectional/manytomany/UnidirectionalManyToManyBagMapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/manytomany/UnidirectionalManyToManyBagMapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyBagCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyBagCollectionEventTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyBagCollectionEventTest.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyBagCollectionEventTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyBagMapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyBagMapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyBagMapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyBagMapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManySetCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManySetCollectionEventTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManySetCollectionEventTest.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManySetCollectionEventTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManySetMapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManySetMapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManySetMapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManySetMapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/values/ParentWithCollectionOfValues.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/values/ParentWithCollectionOfValues.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/values/ParentWithCollectionOfValues.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/values/ParentWithCollectionOfValues.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/values/ValuesBagCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/values/ValuesBagCollectionEventTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/values/ValuesBagCollectionEventTest.java rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/values/ValuesBagCollectionEventTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/event/collection/values/ValuesBagMapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/event/collection/values/ValuesBagMapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/event/collection/values/ValuesBagMapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/event/collection/values/ValuesBagMapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/events/CallbackTest.java b/hibernate-core/src/test/java/org/hibernate/test/events/CallbackTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/events/CallbackTest.java rename to hibernate-core/src/test/java/org/hibernate/test/events/CallbackTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/exception/Group.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/exception/Group.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/exception/Group.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/exception/Group.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/exception/Group.java b/hibernate-core/src/test/java/org/hibernate/test/exception/Group.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/exception/Group.java rename to hibernate-core/src/test/java/org/hibernate/test/exception/Group.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/exception/SQLExceptionConversionTest.java b/hibernate-core/src/test/java/org/hibernate/test/exception/SQLExceptionConversionTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/exception/SQLExceptionConversionTest.java rename to hibernate-core/src/test/java/org/hibernate/test/exception/SQLExceptionConversionTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/exception/User.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/exception/User.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/exception/User.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/exception/User.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/exception/User.java b/hibernate-core/src/test/java/org/hibernate/test/exception/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/exception/User.java rename to hibernate-core/src/test/java/org/hibernate/test/exception/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/extralazy/Document.java b/hibernate-core/src/test/java/org/hibernate/test/extralazy/Document.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/extralazy/Document.java rename to hibernate-core/src/test/java/org/hibernate/test/extralazy/Document.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/extralazy/ExtraLazyTest.java b/hibernate-core/src/test/java/org/hibernate/test/extralazy/ExtraLazyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/extralazy/ExtraLazyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/extralazy/ExtraLazyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/extralazy/Group.java b/hibernate-core/src/test/java/org/hibernate/test/extralazy/Group.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/extralazy/Group.java rename to hibernate-core/src/test/java/org/hibernate/test/extralazy/Group.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/extralazy/SessionAttribute.java b/hibernate-core/src/test/java/org/hibernate/test/extralazy/SessionAttribute.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/extralazy/SessionAttribute.java rename to hibernate-core/src/test/java/org/hibernate/test/extralazy/SessionAttribute.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/extralazy/User.java b/hibernate-core/src/test/java/org/hibernate/test/extralazy/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/extralazy/User.java rename to hibernate-core/src/test/java/org/hibernate/test/extralazy/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/extralazy/UserGroup.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/extralazy/UserGroup.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/extralazy/UserGroup.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/extralazy/UserGroup.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/fetchprofiles/join/Course.java b/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Course.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/fetchprofiles/join/Course.java rename to hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Course.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/fetchprofiles/join/CourseOffering.java b/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/CourseOffering.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/fetchprofiles/join/CourseOffering.java rename to hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/CourseOffering.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/fetchprofiles/join/Department.java b/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Department.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/fetchprofiles/join/Department.java rename to hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Department.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/fetchprofiles/join/Enrollment.java b/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Enrollment.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/fetchprofiles/join/Enrollment.java rename to hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Enrollment.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/fetchprofiles/join/JoinFetchProfileTest.java b/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/JoinFetchProfileTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/fetchprofiles/join/JoinFetchProfileTest.java rename to hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/JoinFetchProfileTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/fetchprofiles/join/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/fetchprofiles/join/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/fetchprofiles/join/Student.java b/hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Student.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/fetchprofiles/join/Student.java rename to hibernate-core/src/test/java/org/hibernate/test/fetchprofiles/join/Student.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/Category.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/filter/Category.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/Category.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/filter/Category.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/Category.java b/hibernate-core/src/test/java/org/hibernate/test/filter/Category.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/Category.java rename to hibernate-core/src/test/java/org/hibernate/test/filter/Category.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/Department.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/filter/Department.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/Department.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/filter/Department.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/Department.java b/hibernate-core/src/test/java/org/hibernate/test/filter/Department.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/Department.java rename to hibernate-core/src/test/java/org/hibernate/test/filter/Department.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/DynamicFilterTest.java b/hibernate-core/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/DynamicFilterTest.java rename to hibernate-core/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/LineItem.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/filter/LineItem.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/LineItem.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/filter/LineItem.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/LineItem.java b/hibernate-core/src/test/java/org/hibernate/test/filter/LineItem.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/LineItem.java rename to hibernate-core/src/test/java/org/hibernate/test/filter/LineItem.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/Order.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/filter/Order.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/Order.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/filter/Order.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/Order.java b/hibernate-core/src/test/java/org/hibernate/test/filter/Order.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/Order.java rename to hibernate-core/src/test/java/org/hibernate/test/filter/Order.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/Product.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/filter/Product.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/Product.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/filter/Product.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/Product.java b/hibernate-core/src/test/java/org/hibernate/test/filter/Product.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/Product.java rename to hibernate-core/src/test/java/org/hibernate/test/filter/Product.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/Salesperson.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/filter/Salesperson.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/Salesperson.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/filter/Salesperson.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/Salesperson.java b/hibernate-core/src/test/java/org/hibernate/test/filter/Salesperson.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/Salesperson.java rename to hibernate-core/src/test/java/org/hibernate/test/filter/Salesperson.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/defs.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/filter/defs.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/defs.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/filter/defs.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/hql/Basic.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/filter/hql/Basic.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/hql/Basic.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/filter/hql/Basic.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/hql/BasicFilteredBulkManipulationTest.java b/hibernate-core/src/test/java/org/hibernate/test/filter/hql/BasicFilteredBulkManipulationTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/hql/BasicFilteredBulkManipulationTest.java rename to hibernate-core/src/test/java/org/hibernate/test/filter/hql/BasicFilteredBulkManipulationTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/hql/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/filter/hql/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/hql/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/filter/hql/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/hql/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/filter/hql/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/hql/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/filter/hql/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/hql/Joined.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/filter/hql/Joined.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/hql/Joined.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/filter/hql/Joined.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/hql/JoinedFilteredBulkManipulationTest.java b/hibernate-core/src/test/java/org/hibernate/test/filter/hql/JoinedFilteredBulkManipulationTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/hql/JoinedFilteredBulkManipulationTest.java rename to hibernate-core/src/test/java/org/hibernate/test/filter/hql/JoinedFilteredBulkManipulationTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/hql/Person.java b/hibernate-core/src/test/java/org/hibernate/test/filter/hql/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/hql/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/filter/hql/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/hql/User.java b/hibernate-core/src/test/java/org/hibernate/test/filter/hql/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/hql/User.java rename to hibernate-core/src/test/java/org/hibernate/test/filter/hql/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/filter/hql/filter-defs.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/filter/hql/filter-defs.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/filter/hql/filter-defs.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/filter/hql/filter-defs.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/flush/Author.java b/hibernate-core/src/test/java/org/hibernate/test/flush/Author.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/flush/Author.java rename to hibernate-core/src/test/java/org/hibernate/test/flush/Author.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/flush/Book.java b/hibernate-core/src/test/java/org/hibernate/test/flush/Book.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/flush/Book.java rename to hibernate-core/src/test/java/org/hibernate/test/flush/Book.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/flush/Publisher.java b/hibernate-core/src/test/java/org/hibernate/test/flush/Publisher.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/flush/Publisher.java rename to hibernate-core/src/test/java/org/hibernate/test/flush/Publisher.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/flush/TestAutoFlushBeforeQueryExecution.java b/hibernate-core/src/test/java/org/hibernate/test/flush/TestAutoFlushBeforeQueryExecution.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/flush/TestAutoFlushBeforeQueryExecution.java rename to hibernate-core/src/test/java/org/hibernate/test/flush/TestAutoFlushBeforeQueryExecution.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java b/hibernate-core/src/test/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java rename to hibernate-core/src/test/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/flush/UnrelatedEntity.java b/hibernate-core/src/test/java/org/hibernate/test/flush/UnrelatedEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/flush/UnrelatedEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/flush/UnrelatedEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/formulajoin/Detail.java b/hibernate-core/src/test/java/org/hibernate/test/formulajoin/Detail.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/formulajoin/Detail.java rename to hibernate-core/src/test/java/org/hibernate/test/formulajoin/Detail.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/formulajoin/FormulaJoinTest.java b/hibernate-core/src/test/java/org/hibernate/test/formulajoin/FormulaJoinTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/formulajoin/FormulaJoinTest.java rename to hibernate-core/src/test/java/org/hibernate/test/formulajoin/FormulaJoinTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/formulajoin/Master.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/formulajoin/Master.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/formulajoin/Master.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/formulajoin/Master.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/formulajoin/Master.java b/hibernate-core/src/test/java/org/hibernate/test/formulajoin/Master.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/formulajoin/Master.java rename to hibernate-core/src/test/java/org/hibernate/test/formulajoin/Master.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generated/AbstractGeneratedPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/test/generated/AbstractGeneratedPropertyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generated/AbstractGeneratedPropertyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/generated/AbstractGeneratedPropertyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generated/ComponentOwner.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/generated/ComponentOwner.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generated/ComponentOwner.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/generated/ComponentOwner.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generated/ComponentOwner.java b/hibernate-core/src/test/java/org/hibernate/test/generated/ComponentOwner.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generated/ComponentOwner.java rename to hibernate-core/src/test/java/org/hibernate/test/generated/ComponentOwner.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generated/GeneratedPropertyEntity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/generated/GeneratedPropertyEntity.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generated/GeneratedPropertyEntity.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/generated/GeneratedPropertyEntity.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generated/GeneratedPropertyEntity.java b/hibernate-core/src/test/java/org/hibernate/test/generated/GeneratedPropertyEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generated/GeneratedPropertyEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/generated/GeneratedPropertyEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generated/MSSQLGeneratedPropertyEntity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/generated/MSSQLGeneratedPropertyEntity.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generated/MSSQLGeneratedPropertyEntity.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/generated/MSSQLGeneratedPropertyEntity.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generated/PartiallyGeneratedComponentTest.java b/hibernate-core/src/test/java/org/hibernate/test/generated/PartiallyGeneratedComponentTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generated/PartiallyGeneratedComponentTest.java rename to hibernate-core/src/test/java/org/hibernate/test/generated/PartiallyGeneratedComponentTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generated/TimestampGeneratedValuesWithCachingTest.java b/hibernate-core/src/test/java/org/hibernate/test/generated/TimestampGeneratedValuesWithCachingTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generated/TimestampGeneratedValuesWithCachingTest.java rename to hibernate-core/src/test/java/org/hibernate/test/generated/TimestampGeneratedValuesWithCachingTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generated/TriggerGeneratedValuesWithCachingTest.java b/hibernate-core/src/test/java/org/hibernate/test/generated/TriggerGeneratedValuesWithCachingTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generated/TriggerGeneratedValuesWithCachingTest.java rename to hibernate-core/src/test/java/org/hibernate/test/generated/TriggerGeneratedValuesWithCachingTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generated/TriggerGeneratedValuesWithoutCachingTest.java b/hibernate-core/src/test/java/org/hibernate/test/generated/TriggerGeneratedValuesWithoutCachingTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generated/TriggerGeneratedValuesWithoutCachingTest.java rename to hibernate-core/src/test/java/org/hibernate/test/generated/TriggerGeneratedValuesWithoutCachingTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/identity/IdentityGeneratedKeysTest.java b/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/IdentityGeneratedKeysTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/identity/IdentityGeneratedKeysTest.java rename to hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/IdentityGeneratedKeysTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/identity/MyChild.java b/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MyChild.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/identity/MyChild.java rename to hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MyChild.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/identity/MyEntity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MyEntity.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/identity/MyEntity.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MyEntity.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/identity/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MyEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/identity/MyEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MyEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/identity/MySibling.java b/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MySibling.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/identity/MySibling.java rename to hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/MySibling.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/select/MyEntity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/select/MyEntity.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/select/MyEntity.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/generatedkeys/select/MyEntity.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/select/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/select/MyEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/select/MyEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/generatedkeys/select/MyEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/select/SelectGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/select/SelectGeneratorTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/select/SelectGeneratorTest.java rename to hibernate-core/src/test/java/org/hibernate/test/generatedkeys/select/SelectGeneratorTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/seqidentity/MyEntity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/seqidentity/MyEntity.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/seqidentity/MyEntity.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/generatedkeys/seqidentity/MyEntity.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/seqidentity/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/seqidentity/MyEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/seqidentity/MyEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/generatedkeys/seqidentity/MyEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/seqidentity/SequenceIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/seqidentity/SequenceIdentityTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/generatedkeys/seqidentity/SequenceIdentityTest.java rename to hibernate-core/src/test/java/org/hibernate/test/generatedkeys/seqidentity/SequenceIdentityTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/ASTParserLoadingOrderByTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingOrderByTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/ASTParserLoadingOrderByTest.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingOrderByTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/ASTParserLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/ASTParserLoadingTest.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Address.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Animal.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/hql/Animal.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Animal.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/hql/Animal.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Animal.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Animal.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Animal.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/Animal.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/BooleanLiteralEntity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/hql/BooleanLiteralEntity.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/BooleanLiteralEntity.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/hql/BooleanLiteralEntity.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/BooleanLiteralEntity.java b/hibernate-core/src/test/java/org/hibernate/test/hql/BooleanLiteralEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/BooleanLiteralEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/BooleanLiteralEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/BulkManipulationTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/BulkManipulationTest.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Car.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Car.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Car.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/Car.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Cat.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Cat.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Cat.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/Cat.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/ClassicTranslatorTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/ClassicTranslatorTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/ClassicTranslatorTest.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/ClassicTranslatorTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Classification.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Classification.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Classification.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/Classification.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/ClassificationType.java b/hibernate-core/src/test/java/org/hibernate/test/hql/ClassificationType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/ClassificationType.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/ClassificationType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/ComponentContainer.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/hql/ComponentContainer.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/ComponentContainer.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/hql/ComponentContainer.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/ComponentContainer.java b/hibernate-core/src/test/java/org/hibernate/test/hql/ComponentContainer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/ComponentContainer.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/ComponentContainer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/CompositeIdEntity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/hql/CompositeIdEntity.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/CompositeIdEntity.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/hql/CompositeIdEntity.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/CompositeIdEntity.java b/hibernate-core/src/test/java/org/hibernate/test/hql/CompositeIdEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/CompositeIdEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/CompositeIdEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/CrazyCompositeKey.java b/hibernate-core/src/test/java/org/hibernate/test/hql/CrazyCompositeKey.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/CrazyCompositeKey.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/CrazyCompositeKey.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/CrazyIdFieldNames.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/hql/CrazyIdFieldNames.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/CrazyIdFieldNames.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/hql/CrazyIdFieldNames.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/CriteriaClassicAggregationReturnTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/CriteriaClassicAggregationReturnTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/CriteriaClassicAggregationReturnTest.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/CriteriaClassicAggregationReturnTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Dog.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Dog.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Dog.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/Dog.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/DomesticAnimal.java b/hibernate-core/src/test/java/org/hibernate/test/hql/DomesticAnimal.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/DomesticAnimal.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/DomesticAnimal.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/EJBQLTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/EJBQLTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/EJBQLTest.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/EJBQLTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/EntityWithArgFunctionAsColumn.java b/hibernate-core/src/test/java/org/hibernate/test/hql/EntityWithArgFunctionAsColumn.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/EntityWithArgFunctionAsColumn.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/EntityWithArgFunctionAsColumn.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/EntityWithCrazyCompositeKey.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/hql/EntityWithCrazyCompositeKey.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/EntityWithCrazyCompositeKey.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/hql/EntityWithCrazyCompositeKey.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/EntityWithCrazyCompositeKey.java b/hibernate-core/src/test/java/org/hibernate/test/hql/EntityWithCrazyCompositeKey.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/EntityWithCrazyCompositeKey.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/EntityWithCrazyCompositeKey.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/EntityWithFunctionAsColumnHolder.java b/hibernate-core/src/test/java/org/hibernate/test/hql/EntityWithFunctionAsColumnHolder.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/EntityWithFunctionAsColumnHolder.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/EntityWithFunctionAsColumnHolder.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/EntityWithNoArgFunctionAsColumn.java b/hibernate-core/src/test/java/org/hibernate/test/hql/EntityWithNoArgFunctionAsColumn.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/EntityWithNoArgFunctionAsColumn.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/EntityWithNoArgFunctionAsColumn.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/FooBarCopy.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/hql/FooBarCopy.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/FooBarCopy.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/hql/FooBarCopy.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/FunctionNameAsColumnTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/FunctionNameAsColumnTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/FunctionNameAsColumnTest.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/FunctionNameAsColumnTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/FunctionNamesAsColumns.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/hql/FunctionNamesAsColumns.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/FunctionNamesAsColumns.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/hql/FunctionNamesAsColumns.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/HQLTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/HQLTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/HQLTest.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/HQLTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/HeresAnotherCrazyIdFieldName.java b/hibernate-core/src/test/java/org/hibernate/test/hql/HeresAnotherCrazyIdFieldName.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/HeresAnotherCrazyIdFieldName.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/HeresAnotherCrazyIdFieldName.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/HqlParserTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/HqlParserTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/HqlParserTest.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/HqlParserTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Human.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Human.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Human.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/Human.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Image.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/hql/Image.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Image.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/hql/Image.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Image.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Image.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Image.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/Image.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/IntegerVersioned.java b/hibernate-core/src/test/java/org/hibernate/test/hql/IntegerVersioned.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/IntegerVersioned.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/IntegerVersioned.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Joiner.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Joiner.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Joiner.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/Joiner.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/KeyManyToOneEntity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/hql/KeyManyToOneEntity.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/KeyManyToOneEntity.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/hql/KeyManyToOneEntity.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/KeyManyToOneEntity.java b/hibernate-core/src/test/java/org/hibernate/test/hql/KeyManyToOneEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/KeyManyToOneEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/KeyManyToOneEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/KeyManyToOneKeyEntity.java b/hibernate-core/src/test/java/org/hibernate/test/hql/KeyManyToOneKeyEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/KeyManyToOneKeyEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/KeyManyToOneKeyEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Lizard.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Lizard.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Lizard.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/Lizard.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Mammal.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Mammal.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Mammal.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/Mammal.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/MoreCrazyIdFieldNameStuffEntity.java b/hibernate-core/src/test/java/org/hibernate/test/hql/MoreCrazyIdFieldNameStuffEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/MoreCrazyIdFieldNameStuffEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/MoreCrazyIdFieldNameStuffEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Name.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Name.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Name.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/Name.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/PettingZoo.java b/hibernate-core/src/test/java/org/hibernate/test/hql/PettingZoo.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/PettingZoo.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/PettingZoo.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Pickup.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Pickup.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Pickup.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/Pickup.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/QueryTranslatorTestCase.java b/hibernate-core/src/test/java/org/hibernate/test/hql/QueryTranslatorTestCase.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/QueryTranslatorTestCase.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/QueryTranslatorTestCase.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Reptile.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Reptile.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Reptile.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/Reptile.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/SUV.java b/hibernate-core/src/test/java/org/hibernate/test/hql/SUV.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/SUV.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/SUV.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/ScrollableCollectionFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/ScrollableCollectionFetchingTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/ScrollableCollectionFetchingTest.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/ScrollableCollectionFetchingTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/SimpleAssociatedEntity.java b/hibernate-core/src/test/java/org/hibernate/test/hql/SimpleAssociatedEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/SimpleAssociatedEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/SimpleAssociatedEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/SimpleEntityWithAssociation.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/hql/SimpleEntityWithAssociation.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/SimpleEntityWithAssociation.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/hql/SimpleEntityWithAssociation.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/SimpleEntityWithAssociation.java b/hibernate-core/src/test/java/org/hibernate/test/hql/SimpleEntityWithAssociation.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/SimpleEntityWithAssociation.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/SimpleEntityWithAssociation.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/StateProvince.java b/hibernate-core/src/test/java/org/hibernate/test/hql/StateProvince.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/StateProvince.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/StateProvince.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/TimestampVersioned.java b/hibernate-core/src/test/java/org/hibernate/test/hql/TimestampVersioned.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/TimestampVersioned.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/TimestampVersioned.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Truck.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Truck.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Truck.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/Truck.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/User.java b/hibernate-core/src/test/java/org/hibernate/test/hql/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/User.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/VariousKeywordPropertyEntity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/hql/VariousKeywordPropertyEntity.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/VariousKeywordPropertyEntity.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/hql/VariousKeywordPropertyEntity.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/VariousKeywordPropertyEntity.java b/hibernate-core/src/test/java/org/hibernate/test/hql/VariousKeywordPropertyEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/VariousKeywordPropertyEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/VariousKeywordPropertyEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Vehicle.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/hql/Vehicle.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Vehicle.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/hql/Vehicle.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Vehicle.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Vehicle.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Vehicle.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/Vehicle.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Versions.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/hql/Versions.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Versions.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/hql/Versions.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/WithClauseTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/WithClauseTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/WithClauseTest.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/WithClauseTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/Zoo.java b/hibernate-core/src/test/java/org/hibernate/test/hql/Zoo.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/Zoo.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/Zoo.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/joinedSubclass/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/hql/joinedSubclass/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/joinedSubclass/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/joinedSubclass/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/joinedSubclass/JoinedSubclassBulkManipTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/joinedSubclass/JoinedSubclassBulkManipTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/joinedSubclass/JoinedSubclassBulkManipTest.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/joinedSubclass/JoinedSubclassBulkManipTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/joinedSubclass/Person.java b/hibernate-core/src/test/java/org/hibernate/test/hql/joinedSubclass/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/hql/joinedSubclass/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/hql/joinedSubclass/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/id/Car.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/id/Car.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/id/Car.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/id/Car.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/id/Car.java b/hibernate-core/src/test/java/org/hibernate/test/id/Car.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/id/Car.java rename to hibernate-core/src/test/java/org/hibernate/test/id/Car.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/id/MultipleHiLoPerTableGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/test/id/MultipleHiLoPerTableGeneratorTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/id/MultipleHiLoPerTableGeneratorTest.java rename to hibernate-core/src/test/java/org/hibernate/test/id/MultipleHiLoPerTableGeneratorTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/id/Plane.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/id/Plane.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/id/Plane.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/id/Plane.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/id/Plane.java b/hibernate-core/src/test/java/org/hibernate/test/id/Plane.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/id/Plane.java rename to hibernate-core/src/test/java/org/hibernate/test/id/Plane.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/id/Product.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/id/Product.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/id/Product.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/id/Product.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/id/Product.java b/hibernate-core/src/test/java/org/hibernate/test/id/Product.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/id/Product.java rename to hibernate-core/src/test/java/org/hibernate/test/id/Product.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/id/Radio.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/id/Radio.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/id/Radio.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/id/Radio.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/id/Radio.java b/hibernate-core/src/test/java/org/hibernate/test/id/Radio.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/id/Radio.java rename to hibernate-core/src/test/java/org/hibernate/test/id/Radio.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/id/UseIdentifierRollbackTest.java b/hibernate-core/src/test/java/org/hibernate/test/id/UseIdentifierRollbackTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/id/UseIdentifierRollbackTest.java rename to hibernate-core/src/test/java/org/hibernate/test/id/UseIdentifierRollbackTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/id/uuid/sqlrep/Node.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/id/uuid/sqlrep/Node.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/id/uuid/sqlrep/Node.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/id/uuid/sqlrep/Node.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/id/uuid/sqlrep/Node.java b/hibernate-core/src/test/java/org/hibernate/test/id/uuid/sqlrep/Node.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/id/uuid/sqlrep/Node.java rename to hibernate-core/src/test/java/org/hibernate/test/id/uuid/sqlrep/Node.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/id/uuid/sqlrep/Node2.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/id/uuid/sqlrep/Node2.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/id/uuid/sqlrep/Node2.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/id/uuid/sqlrep/Node2.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/id/uuid/sqlrep/sqlbinary/UUIDBinaryTest.java b/hibernate-core/src/test/java/org/hibernate/test/id/uuid/sqlrep/sqlbinary/UUIDBinaryTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/id/uuid/sqlrep/sqlbinary/UUIDBinaryTest.java rename to hibernate-core/src/test/java/org/hibernate/test/id/uuid/sqlrep/sqlbinary/UUIDBinaryTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/id/uuid/sqlrep/sqlchar/UUIDCharTest.java b/hibernate-core/src/test/java/org/hibernate/test/id/uuid/sqlrep/sqlchar/UUIDCharTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/id/uuid/sqlrep/sqlchar/UUIDCharTest.java rename to hibernate-core/src/test/java/org/hibernate/test/id/uuid/sqlrep/sqlchar/UUIDCharTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/id/uuid/strategy/CustomStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/test/id/uuid/strategy/CustomStrategyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/id/uuid/strategy/CustomStrategyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/id/uuid/strategy/CustomStrategyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/id/uuid/strategy/Node.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/id/uuid/strategy/Node.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/id/uuid/strategy/Node.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/id/uuid/strategy/Node.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/id/uuid/strategy/Node.java b/hibernate-core/src/test/java/org/hibernate/test/id/uuid/strategy/Node.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/id/uuid/strategy/Node.java rename to hibernate-core/src/test/java/org/hibernate/test/id/uuid/strategy/Node.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idbag/Group.java b/hibernate-core/src/test/java/org/hibernate/test/idbag/Group.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idbag/Group.java rename to hibernate-core/src/test/java/org/hibernate/test/idbag/Group.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idbag/IdBagTest.java b/hibernate-core/src/test/java/org/hibernate/test/idbag/IdBagTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idbag/IdBagTest.java rename to hibernate-core/src/test/java/org/hibernate/test/idbag/IdBagTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idbag/User.java b/hibernate-core/src/test/java/org/hibernate/test/idbag/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idbag/User.java rename to hibernate-core/src/test/java/org/hibernate/test/idbag/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idbag/UserGroup.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/idbag/UserGroup.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idbag/UserGroup.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/idbag/UserGroup.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idclass/Customer.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/idclass/Customer.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idclass/Customer.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/idclass/Customer.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idclass/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/idclass/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idclass/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/idclass/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idclass/CustomerId.java b/hibernate-core/src/test/java/org/hibernate/test/idclass/CustomerId.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idclass/CustomerId.java rename to hibernate-core/src/test/java/org/hibernate/test/idclass/CustomerId.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idclass/FavoriteCustomer.java b/hibernate-core/src/test/java/org/hibernate/test/idclass/FavoriteCustomer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idclass/FavoriteCustomer.java rename to hibernate-core/src/test/java/org/hibernate/test/idclass/FavoriteCustomer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idclass/IdClassTest.java b/hibernate-core/src/test/java/org/hibernate/test/idclass/IdClassTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idclass/IdClassTest.java rename to hibernate-core/src/test/java/org/hibernate/test/idclass/IdClassTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/biginteger/increment/BigIntegerIncrementGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/test/idgen/biginteger/increment/BigIntegerIncrementGeneratorTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/biginteger/increment/BigIntegerIncrementGeneratorTest.java rename to hibernate-core/src/test/java/org/hibernate/test/idgen/biginteger/increment/BigIntegerIncrementGeneratorTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/biginteger/increment/Entity.java b/hibernate-core/src/test/java/org/hibernate/test/idgen/biginteger/increment/Entity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/biginteger/increment/Entity.java rename to hibernate-core/src/test/java/org/hibernate/test/idgen/biginteger/increment/Entity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/biginteger/increment/Mapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/idgen/biginteger/increment/Mapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/biginteger/increment/Mapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/idgen/biginteger/increment/Mapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorTest.java rename to hibernate-core/src/test/java/org/hibernate/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/biginteger/sequence/Entity.java b/hibernate-core/src/test/java/org/hibernate/test/idgen/biginteger/sequence/Entity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/biginteger/sequence/Entity.java rename to hibernate-core/src/test/java/org/hibernate/test/idgen/biginteger/sequence/Entity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/biginteger/sequence/Mapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/idgen/biginteger/sequence/Mapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/biginteger/sequence/Mapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/idgen/biginteger/sequence/Mapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/forcedtable/Basic.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/Basic.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/forcedtable/Basic.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/Basic.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/forcedtable/BasicForcedTableSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/BasicForcedTableSequenceTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/forcedtable/BasicForcedTableSequenceTest.java rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/BasicForcedTableSequenceTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/forcedtable/Entity.java b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/Entity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/forcedtable/Entity.java rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/Entity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/forcedtable/HiLo.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/HiLo.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/forcedtable/HiLo.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/HiLo.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/forcedtable/HiLoForcedTableSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/HiLoForcedTableSequenceTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/forcedtable/HiLoForcedTableSequenceTest.java rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/HiLoForcedTableSequenceTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/forcedtable/Pooled.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/Pooled.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/forcedtable/Pooled.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/Pooled.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/sequence/Basic.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/Basic.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/sequence/Basic.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/Basic.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/sequence/BasicSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/BasicSequenceTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/sequence/BasicSequenceTest.java rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/BasicSequenceTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/sequence/Dedicated.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/Dedicated.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/sequence/Dedicated.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/Dedicated.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/sequence/Entity.java b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/Entity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/sequence/Entity.java rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/Entity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/sequence/HiLo.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/HiLo.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/sequence/HiLo.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/HiLo.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/sequence/HiLoSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/HiLoSequenceTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/sequence/HiLoSequenceTest.java rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/HiLoSequenceTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/sequence/Pooled.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/Pooled.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/sequence/Pooled.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/Pooled.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/sequence/PooledSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/PooledSequenceTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/sequence/PooledSequenceTest.java rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/sequence/PooledSequenceTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/table/Basic.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/Basic.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/table/Basic.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/Basic.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/table/BasicTableTest.java b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/BasicTableTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/table/BasicTableTest.java rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/BasicTableTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/table/Entity.java b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/Entity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/table/Entity.java rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/Entity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/table/HiLo.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/HiLo.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/table/HiLo.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/HiLo.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/table/HiLoTableTest.java b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/HiLoTableTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/table/HiLoTableTest.java rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/HiLoTableTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/table/Pooled.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/Pooled.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/table/Pooled.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/Pooled.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/table/PooledTableTest.java b/hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/PooledTableTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idgen/enhanced/table/PooledTableTest.java rename to hibernate-core/src/test/java/org/hibernate/test/idgen/enhanced/table/PooledTableTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idprops/IdentifierPropertyReferencesTest.java b/hibernate-core/src/test/java/org/hibernate/test/idprops/IdentifierPropertyReferencesTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idprops/IdentifierPropertyReferencesTest.java rename to hibernate-core/src/test/java/org/hibernate/test/idprops/IdentifierPropertyReferencesTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idprops/LineItem.java b/hibernate-core/src/test/java/org/hibernate/test/idprops/LineItem.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idprops/LineItem.java rename to hibernate-core/src/test/java/org/hibernate/test/idprops/LineItem.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idprops/LineItemPK.java b/hibernate-core/src/test/java/org/hibernate/test/idprops/LineItemPK.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idprops/LineItemPK.java rename to hibernate-core/src/test/java/org/hibernate/test/idprops/LineItemPK.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idprops/Mapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/idprops/Mapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idprops/Mapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/idprops/Mapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idprops/Order.java b/hibernate-core/src/test/java/org/hibernate/test/idprops/Order.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idprops/Order.java rename to hibernate-core/src/test/java/org/hibernate/test/idprops/Order.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/idprops/Person.java b/hibernate-core/src/test/java/org/hibernate/test/idprops/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/idprops/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/idprops/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/Contract.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/Contract.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/Contract.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/Contract.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/ContractVariation.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/immutable/ContractVariation.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/ContractVariation.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/immutable/ContractVariation.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/ContractVariation.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/ContractVariation.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/ContractVariation.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/ContractVariation.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/ImmutableTest.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/ImmutableTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/ImmutableTest.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/ImmutableTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/Info.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/Info.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/Info.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/Info.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/Party.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/Party.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/Party.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/Party.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/Plan.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/Plan.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/Plan.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/Plan.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/Contract.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/Contract.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/Contract.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/Contract.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/ContractVariation.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/ContractVariation.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/ContractVariation.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/ContractVariation.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/Info.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/Info.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/Info.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/Info.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/Owner.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/Owner.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/Owner.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/Owner.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/Party.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/Party.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/Party.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/Party.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/Plan.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/Plan.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/Plan.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/Plan.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariation.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariation.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariation.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariation.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationOneToManyJoin.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationOneToManyJoin.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationOneToManyJoin.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationOneToManyJoin.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersioned.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersioned.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersioned.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersioned.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersionedOneToManyJoin.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersionedOneToManyJoin.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersionedOneToManyJoin.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersionedOneToManyJoin.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseManyToManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseManyToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseManyToManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyJoinTest.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyJoinTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyJoinTest.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyJoinTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseManyToManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseManyToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseManyToManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyFailureExpectedTest.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyFailureExpectedTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyFailureExpectedTest.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyFailureExpectedTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinFailureExpectedTest.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinFailureExpectedTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinFailureExpectedTest.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinFailureExpectedTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinTest.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinTest.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariation.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariation.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariation.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariation.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationOneToManyJoin.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationOneToManyJoin.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationOneToManyJoin.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationOneToManyJoin.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationUnidir.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationUnidir.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationUnidir.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationUnidir.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersioned.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersioned.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersioned.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersioned.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersionedOneToManyJoin.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersionedOneToManyJoin.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersionedOneToManyJoin.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersionedOneToManyJoin.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyUnidirTest.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyUnidirTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyUnidirTest.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyUnidirTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyJoinTest.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyJoinTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyJoinTest.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyJoinTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyUnidirTest.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyUnidirTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyUnidirTest.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyUnidirTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseManyToManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseManyToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseManyToManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyJoinTest.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyJoinTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyJoinTest.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyJoinTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/inheritancediscriminator/InheritingEntity.java b/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/InheritingEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/inheritancediscriminator/InheritingEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/InheritingEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/inheritancediscriminator/ParentEntity.java b/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/ParentEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/inheritancediscriminator/ParentEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/ParentEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/inheritancediscriminator/PersistChildEntitiesWithDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/PersistChildEntitiesWithDiscriminatorTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/inheritancediscriminator/PersistChildEntitiesWithDiscriminatorTest.java rename to hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/PersistChildEntitiesWithDiscriminatorTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/insertordering/Group.java b/hibernate-core/src/test/java/org/hibernate/test/insertordering/Group.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/insertordering/Group.java rename to hibernate-core/src/test/java/org/hibernate/test/insertordering/Group.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/insertordering/InsertOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/test/insertordering/InsertOrderingTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/insertordering/InsertOrderingTest.java rename to hibernate-core/src/test/java/org/hibernate/test/insertordering/InsertOrderingTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/insertordering/Mapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/insertordering/Mapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/insertordering/Mapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/insertordering/Mapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/insertordering/Membership.java b/hibernate-core/src/test/java/org/hibernate/test/insertordering/Membership.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/insertordering/Membership.java rename to hibernate-core/src/test/java/org/hibernate/test/insertordering/Membership.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/insertordering/User.java b/hibernate-core/src/test/java/org/hibernate/test/insertordering/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/insertordering/User.java rename to hibernate-core/src/test/java/org/hibernate/test/insertordering/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/buildtime/InstrumentTest.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/buildtime/InstrumentTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/buildtime/InstrumentTest.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/buildtime/InstrumentTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/AbstractExecutable.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/cases/AbstractExecutable.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/AbstractExecutable.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/cases/AbstractExecutable.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/Executable.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/cases/Executable.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/Executable.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/cases/Executable.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/TestCustomColumnReadAndWrite.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestCustomColumnReadAndWrite.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/TestCustomColumnReadAndWrite.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestCustomColumnReadAndWrite.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/TestDirtyCheckExecutable.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestDirtyCheckExecutable.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/TestDirtyCheckExecutable.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestDirtyCheckExecutable.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/TestFetchAllExecutable.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestFetchAllExecutable.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/TestFetchAllExecutable.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestFetchAllExecutable.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/TestInjectFieldInterceptorExecutable.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestInjectFieldInterceptorExecutable.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/TestInjectFieldInterceptorExecutable.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestInjectFieldInterceptorExecutable.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/TestIsPropertyInitializedExecutable.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestIsPropertyInitializedExecutable.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/TestIsPropertyInitializedExecutable.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestIsPropertyInitializedExecutable.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/TestLazyExecutable.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestLazyExecutable.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/TestLazyExecutable.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestLazyExecutable.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/TestLazyManyToOneExecutable.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestLazyManyToOneExecutable.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/TestLazyManyToOneExecutable.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestLazyManyToOneExecutable.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/TestLazyPropertyCustomTypeExecutable.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestLazyPropertyCustomTypeExecutable.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/TestLazyPropertyCustomTypeExecutable.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestLazyPropertyCustomTypeExecutable.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/TestManyToOneProxyExecutable.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestManyToOneProxyExecutable.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/TestManyToOneProxyExecutable.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestManyToOneProxyExecutable.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/TestSharedPKOneToOneExecutable.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestSharedPKOneToOneExecutable.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/TestSharedPKOneToOneExecutable.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/cases/TestSharedPKOneToOneExecutable.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/CustomBlobType.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/domain/CustomBlobType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/CustomBlobType.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/domain/CustomBlobType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/Document.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/domain/Document.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/Document.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/domain/Document.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/Documents.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/instrument/domain/Documents.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/Documents.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/instrument/domain/Documents.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/Entity.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/domain/Entity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/Entity.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/domain/Entity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/EntityWithOneToOnes.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/domain/EntityWithOneToOnes.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/EntityWithOneToOnes.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/domain/EntityWithOneToOnes.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/Folder.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/domain/Folder.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/Folder.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/domain/Folder.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/OneToOneNoProxy.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/domain/OneToOneNoProxy.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/OneToOneNoProxy.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/domain/OneToOneNoProxy.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/OneToOneProxy.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/domain/OneToOneProxy.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/OneToOneProxy.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/domain/OneToOneProxy.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/Owner.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/domain/Owner.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/Owner.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/domain/Owner.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/Problematic.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/instrument/domain/Problematic.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/Problematic.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/instrument/domain/Problematic.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/Problematic.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/domain/Problematic.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/Problematic.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/domain/Problematic.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/SharedPKOneToOne.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/instrument/domain/SharedPKOneToOne.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/domain/SharedPKOneToOne.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/instrument/domain/SharedPKOneToOne.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/runtime/AbstractTransformingClassLoaderInstrumentTestCase.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/runtime/AbstractTransformingClassLoaderInstrumentTestCase.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/runtime/AbstractTransformingClassLoaderInstrumentTestCase.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/runtime/AbstractTransformingClassLoaderInstrumentTestCase.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/runtime/JavassistInstrumentationTest.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/runtime/JavassistInstrumentationTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/instrument/runtime/JavassistInstrumentationTest.java rename to hibernate-core/src/test/java/org/hibernate/test/instrument/runtime/JavassistInstrumentationTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interceptor/CollectionInterceptor.java b/hibernate-core/src/test/java/org/hibernate/test/interceptor/CollectionInterceptor.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interceptor/CollectionInterceptor.java rename to hibernate-core/src/test/java/org/hibernate/test/interceptor/CollectionInterceptor.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interceptor/Image.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/interceptor/Image.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interceptor/Image.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/interceptor/Image.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interceptor/Image.java b/hibernate-core/src/test/java/org/hibernate/test/interceptor/Image.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interceptor/Image.java rename to hibernate-core/src/test/java/org/hibernate/test/interceptor/Image.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interceptor/InstantiateInterceptor.java b/hibernate-core/src/test/java/org/hibernate/test/interceptor/InstantiateInterceptor.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interceptor/InstantiateInterceptor.java rename to hibernate-core/src/test/java/org/hibernate/test/interceptor/InstantiateInterceptor.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interceptor/InterceptorTest.java b/hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interceptor/InterceptorTest.java rename to hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interceptor/Log.java b/hibernate-core/src/test/java/org/hibernate/test/interceptor/Log.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interceptor/Log.java rename to hibernate-core/src/test/java/org/hibernate/test/interceptor/Log.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interceptor/PropertyInterceptor.java b/hibernate-core/src/test/java/org/hibernate/test/interceptor/PropertyInterceptor.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interceptor/PropertyInterceptor.java rename to hibernate-core/src/test/java/org/hibernate/test/interceptor/PropertyInterceptor.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interceptor/StatefulInterceptor.java b/hibernate-core/src/test/java/org/hibernate/test/interceptor/StatefulInterceptor.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interceptor/StatefulInterceptor.java rename to hibernate-core/src/test/java/org/hibernate/test/interceptor/StatefulInterceptor.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interceptor/User.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/interceptor/User.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interceptor/User.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/interceptor/User.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interceptor/User.java b/hibernate-core/src/test/java/org/hibernate/test/interceptor/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interceptor/User.java rename to hibernate-core/src/test/java/org/hibernate/test/interceptor/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/Document.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Document.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/Document.java rename to hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Document.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/DocumentImpl.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/DocumentImpl.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/DocumentImpl.java rename to hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/DocumentImpl.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/DocumentInterceptor.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/DocumentInterceptor.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/DocumentInterceptor.java rename to hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/DocumentInterceptor.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/Folder.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Folder.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/Folder.java rename to hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Folder.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/FolderImpl.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/FolderImpl.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/FolderImpl.java rename to hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/FolderImpl.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/InterfaceProxyTest.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/InterfaceProxyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/InterfaceProxyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/InterfaceProxyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/Item.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Item.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/Item.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Item.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/Item.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Item.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/Item.java rename to hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Item.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/ItemImpl.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/ItemImpl.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/ItemImpl.java rename to hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/ItemImpl.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/SecureDocument.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/SecureDocument.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/SecureDocument.java rename to hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/SecureDocument.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/SecureDocumentImpl.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/SecureDocumentImpl.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/interfaceproxy/SecureDocumentImpl.java rename to hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/SecureDocumentImpl.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/iterate/Item.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/iterate/Item.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/iterate/Item.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/iterate/Item.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/iterate/Item.java b/hibernate-core/src/test/java/org/hibernate/test/iterate/Item.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/iterate/Item.java rename to hibernate-core/src/test/java/org/hibernate/test/iterate/Item.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/iterate/IterateTest.java b/hibernate-core/src/test/java/org/hibernate/test/iterate/IterateTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/iterate/IterateTest.java rename to hibernate-core/src/test/java/org/hibernate/test/iterate/IterateTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jdbc/Boat.java b/hibernate-core/src/test/java/org/hibernate/test/jdbc/Boat.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jdbc/Boat.java rename to hibernate-core/src/test/java/org/hibernate/test/jdbc/Boat.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jdbc/GeneralWorkTest.java b/hibernate-core/src/test/java/org/hibernate/test/jdbc/GeneralWorkTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jdbc/GeneralWorkTest.java rename to hibernate-core/src/test/java/org/hibernate/test/jdbc/GeneralWorkTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jdbc/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/jdbc/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jdbc/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/jdbc/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jdbc/Person.java b/hibernate-core/src/test/java/org/hibernate/test/jdbc/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jdbc/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/jdbc/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/join/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/join/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/join/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/join/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/join/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/join/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/join/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/join/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/join/JoinTest.java b/hibernate-core/src/test/java/org/hibernate/test/join/JoinTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/join/JoinTest.java rename to hibernate-core/src/test/java/org/hibernate/test/join/JoinTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/join/OptionalJoinTest.java b/hibernate-core/src/test/java/org/hibernate/test/join/OptionalJoinTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/join/OptionalJoinTest.java rename to hibernate-core/src/test/java/org/hibernate/test/join/OptionalJoinTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/join/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/join/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/join/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/join/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/join/Person.java b/hibernate-core/src/test/java/org/hibernate/test/join/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/join/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/join/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/join/Thing.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/join/Thing.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/join/Thing.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/join/Thing.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/join/Thing.java b/hibernate-core/src/test/java/org/hibernate/test/join/Thing.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/join/Thing.java rename to hibernate-core/src/test/java/org/hibernate/test/join/Thing.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/join/User.java b/hibernate-core/src/test/java/org/hibernate/test/join/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/join/User.java rename to hibernate-core/src/test/java/org/hibernate/test/join/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/joinedsubclass/Address.java b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/joinedsubclass/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/joinedsubclass/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/joinedsubclass/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/joinedsubclass/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/joinedsubclass/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java rename to hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/joinedsubclass/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/joinedsubclass/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/joinedsubclass/Person.java b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/joinedsubclass/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/joinfetch/Bid.java b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/Bid.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/joinfetch/Bid.java rename to hibernate-core/src/test/java/org/hibernate/test/joinfetch/Bid.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/joinfetch/Category.java b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/Category.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/joinfetch/Category.java rename to hibernate-core/src/test/java/org/hibernate/test/joinfetch/Category.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/joinfetch/Comment.java b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/Comment.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/joinfetch/Comment.java rename to hibernate-core/src/test/java/org/hibernate/test/joinfetch/Comment.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/joinfetch/Group.java b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/Group.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/joinfetch/Group.java rename to hibernate-core/src/test/java/org/hibernate/test/joinfetch/Group.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/joinfetch/Item.java b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/Item.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/joinfetch/Item.java rename to hibernate-core/src/test/java/org/hibernate/test/joinfetch/Item.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/joinfetch/ItemBid.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/ItemBid.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/joinfetch/ItemBid.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/joinfetch/ItemBid.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/joinfetch/JoinFetchTest.java b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/JoinFetchTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/joinfetch/JoinFetchTest.java rename to hibernate-core/src/test/java/org/hibernate/test/joinfetch/JoinFetchTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/joinfetch/User.java b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/joinfetch/User.java rename to hibernate-core/src/test/java/org/hibernate/test/joinfetch/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/joinfetch/UserGroup.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/UserGroup.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/joinfetch/UserGroup.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/joinfetch/UserGroup.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/AbstractJPATest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/AbstractJPATest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/AbstractJPATest.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/AbstractJPATest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/Item.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/jpa/Item.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/Item.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/jpa/Item.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/Item.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/Item.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/Item.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/Item.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/MyEntity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/jpa/MyEntity.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/MyEntity.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/jpa/MyEntity.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/MyEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/MyEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/MyEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/MySubclassEntity.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/MySubclassEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/MySubclassEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/MySubclassEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/Part.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/jpa/Part.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/Part.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/jpa/Part.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/Part.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/Part.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/Part.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/Part.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/CascadeTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/CascadeTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/CascadeTest.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/CascadeTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/Child.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/Child.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/Child.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/Child.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/ChildAssigned.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/ChildAssigned.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/ChildAssigned.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/ChildAssigned.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/ChildInfo.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/ChildInfo.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/ChildInfo.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/ChildInfo.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/ChildInfoAssigned.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/ChildInfoAssigned.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/ChildInfoAssigned.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/ChildInfoAssigned.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/Other.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/Other.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/Other.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/Other.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/OtherAssigned.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/OtherAssigned.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/OtherAssigned.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/OtherAssigned.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/Parent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/Parent.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/Parent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/ParentAssigned.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/ParentAssigned.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/ParentAssigned.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/ParentAssigned.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/ParentChild.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/ParentChild.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/ParentChild.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/ParentChild.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/ParentInfo.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/ParentInfo.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/ParentInfo.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/ParentInfo.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/ParentInfoAssigned.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/ParentInfoAssigned.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/cascade/ParentInfoAssigned.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/ParentInfoAssigned.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/fetch/FetchingTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/fetch/FetchingTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/fetch/FetchingTest.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/fetch/FetchingTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/fetch/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/jpa/fetch/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/fetch/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/jpa/fetch/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/fetch/Person.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/fetch/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/fetch/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/fetch/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/fetch/Stay.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/fetch/Stay.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/fetch/Stay.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/fetch/Stay.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/lock/JPALockTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/lock/JPALockTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/lock/JPALockTest.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/lock/JPALockTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/lock/RepeatableReadTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/lock/RepeatableReadTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/lock/RepeatableReadTest.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/lock/RepeatableReadTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/naturalid/Group.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/Group.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/naturalid/Group.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/Group.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/naturalid/ImmutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/ImmutableNaturalIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/naturalid/ImmutableNaturalIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/ImmutableNaturalIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/naturalid/MutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/MutableNaturalIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/naturalid/MutableNaturalIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/MutableNaturalIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/naturalid/User.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/User.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/naturalid/User.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/User.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/naturalid/User.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/naturalid/User.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/package.html b/hibernate-core/src/test/java/org/hibernate/test/jpa/package.html similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/package.html rename to hibernate-core/src/test/java/org/hibernate/test/jpa/package.html diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/proxy/JPAProxyTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/proxy/JPAProxyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/proxy/JPAProxyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/proxy/JPAProxyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/ql/JPAQLComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/JPAQLComplianceTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/ql/JPAQLComplianceTest.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/ql/JPAQLComplianceTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/ql/NativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/NativeQueryTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/ql/NativeQueryTest.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/ql/NativeQueryTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/removed/RemovedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/removed/RemovedEntityTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/removed/RemovedEntityTest.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/removed/RemovedEntityTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/txn/TransactionJoiningTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/txn/TransactionJoiningTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/jpa/txn/TransactionJoiningTest.java rename to hibernate-core/src/test/java/org/hibernate/test/jpa/txn/TransactionJoiningTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/component/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/component/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/component/EagerMapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerMapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/component/EagerMapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerMapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/component/LazyKeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/LazyKeyManyToOneTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/component/LazyKeyManyToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/LazyKeyManyToOneTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/component/LazyMapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/LazyMapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/component/LazyMapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/LazyMapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/component/Order.java b/hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/Order.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/component/Order.java rename to hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/Order.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/embedded/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/embedded/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/embedded/Mapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/Mapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/embedded/Mapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/Mapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/embedded/Order.java b/hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/Order.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/keymanytoone/bidir/embedded/Order.java rename to hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/Order.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lazycache/Document.java b/hibernate-core/src/test/java/org/hibernate/test/lazycache/Document.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lazycache/Document.java rename to hibernate-core/src/test/java/org/hibernate/test/lazycache/Document.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lazycache/Documents.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/lazycache/Documents.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lazycache/Documents.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/lazycache/Documents.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lazycache/InstrumentCacheTest.java b/hibernate-core/src/test/java/org/hibernate/test/lazycache/InstrumentCacheTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lazycache/InstrumentCacheTest.java rename to hibernate-core/src/test/java/org/hibernate/test/lazycache/InstrumentCacheTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lazyonetoone/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lazyonetoone/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lazyonetoone/Employment.java b/hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Employment.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lazyonetoone/Employment.java rename to hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Employment.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lazyonetoone/LazyOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/LazyOneToOneTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lazyonetoone/LazyOneToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/LazyOneToOneTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lazyonetoone/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lazyonetoone/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lazyonetoone/Person.java b/hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lazyonetoone/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/ABCProxyTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/ABCProxyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/ABCProxyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/ABCProxyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/ABCTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/ABCTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/ABCTest.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/ABCTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/ComponentNotNullTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentNotNullTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/ComponentNotNullTest.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentNotNullTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/CustomSQLTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/CustomSQLTest.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/FooBarTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/FooBarTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/FooBarTest.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/FooBarTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/FumTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/FumTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/FumTest.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/FumTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/IJ2Test.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/IJ2Test.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/IJ2Test.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/IJ2Test.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/IJTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/IJTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/IJTest.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/IJTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/LegacyTestCase.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/LegacyTestCase.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/LegacyTestCase.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/LegacyTestCase.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/MapTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/MapTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/MapTest.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/MapTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/MasterDetailTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/MasterDetailTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/MasterDetailTest.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/MasterDetailTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/MultiTableTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/MultiTableTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/MultiTableTest.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/MultiTableTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/OneToOneCacheTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/OneToOneCacheTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/OneToOneCacheTest.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/OneToOneCacheTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/ParentChildTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/ParentChildTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/ParentChildTest.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/ParentChildTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/QueryByExampleTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/QueryByExampleTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/QueryByExampleTest.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/QueryByExampleTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/SQLFunctionsTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/SQLFunctionsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/SQLLoaderTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/SQLLoaderTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/SQLLoaderTest.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/SQLLoaderTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/StatisticsTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/StatisticsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/StatisticsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/StatisticsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/BlobLocatorTest.java b/hibernate-core/src/test/java/org/hibernate/test/lob/BlobLocatorTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/BlobLocatorTest.java rename to hibernate-core/src/test/java/org/hibernate/test/lob/BlobLocatorTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/ClobLocatorTest.java b/hibernate-core/src/test/java/org/hibernate/test/lob/ClobLocatorTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/ClobLocatorTest.java rename to hibernate-core/src/test/java/org/hibernate/test/lob/ClobLocatorTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/ImageMappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/lob/ImageMappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/ImageMappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/lob/ImageMappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/ImageTest.java b/hibernate-core/src/test/java/org/hibernate/test/lob/ImageTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/ImageTest.java rename to hibernate-core/src/test/java/org/hibernate/test/lob/ImageTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/LobHolder.java b/hibernate-core/src/test/java/org/hibernate/test/lob/LobHolder.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/LobHolder.java rename to hibernate-core/src/test/java/org/hibernate/test/lob/LobHolder.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/LobMappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/lob/LobMappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/LobMappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/lob/LobMappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/LobMergeTest.java b/hibernate-core/src/test/java/org/hibernate/test/lob/LobMergeTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/LobMergeTest.java rename to hibernate-core/src/test/java/org/hibernate/test/lob/LobMergeTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/LongByteArrayHolder.java b/hibernate-core/src/test/java/org/hibernate/test/lob/LongByteArrayHolder.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/LongByteArrayHolder.java rename to hibernate-core/src/test/java/org/hibernate/test/lob/LongByteArrayHolder.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/LongByteArrayTest.java b/hibernate-core/src/test/java/org/hibernate/test/lob/LongByteArrayTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/LongByteArrayTest.java rename to hibernate-core/src/test/java/org/hibernate/test/lob/LongByteArrayTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/LongStringHolder.java b/hibernate-core/src/test/java/org/hibernate/test/lob/LongStringHolder.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/LongStringHolder.java rename to hibernate-core/src/test/java/org/hibernate/test/lob/LongStringHolder.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/LongStringTest.java b/hibernate-core/src/test/java/org/hibernate/test/lob/LongStringTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/LongStringTest.java rename to hibernate-core/src/test/java/org/hibernate/test/lob/LongStringTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/MaterializedBlobMappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/lob/MaterializedBlobMappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/MaterializedBlobMappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/lob/MaterializedBlobMappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/MaterializedBlobTest.java b/hibernate-core/src/test/java/org/hibernate/test/lob/MaterializedBlobTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/MaterializedBlobTest.java rename to hibernate-core/src/test/java/org/hibernate/test/lob/MaterializedBlobTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/MaterializedClobMappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/lob/MaterializedClobMappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/MaterializedClobMappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/lob/MaterializedClobMappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/MaterializedClobTest.java b/hibernate-core/src/test/java/org/hibernate/test/lob/MaterializedClobTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/MaterializedClobTest.java rename to hibernate-core/src/test/java/org/hibernate/test/lob/MaterializedClobTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/SerializableData.java b/hibernate-core/src/test/java/org/hibernate/test/lob/SerializableData.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/SerializableData.java rename to hibernate-core/src/test/java/org/hibernate/test/lob/SerializableData.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/SerializableHolder.java b/hibernate-core/src/test/java/org/hibernate/test/lob/SerializableHolder.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/SerializableHolder.java rename to hibernate-core/src/test/java/org/hibernate/test/lob/SerializableHolder.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/SerializableMappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/lob/SerializableMappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/SerializableMappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/lob/SerializableMappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/SerializableTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/lob/SerializableTypeTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/SerializableTypeTest.java rename to hibernate-core/src/test/java/org/hibernate/test/lob/SerializableTypeTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/TextMappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/lob/TextMappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/TextMappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/lob/TextMappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/TextTest.java b/hibernate-core/src/test/java/org/hibernate/test/lob/TextTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/lob/TextTest.java rename to hibernate-core/src/test/java/org/hibernate/test/lob/TextTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/locking/A.java b/hibernate-core/src/test/java/org/hibernate/test/locking/A.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/locking/A.java rename to hibernate-core/src/test/java/org/hibernate/test/locking/A.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/locking/LockModeTest.java b/hibernate-core/src/test/java/org/hibernate/test/locking/LockModeTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/locking/LockModeTest.java rename to hibernate-core/src/test/java/org/hibernate/test/locking/LockModeTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomany/Group.java b/hibernate-core/src/test/java/org/hibernate/test/manytomany/Group.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomany/Group.java rename to hibernate-core/src/test/java/org/hibernate/test/manytomany/Group.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomany/ManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/manytomany/ManyToManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomany/ManyToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/manytomany/ManyToManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomany/User.java b/hibernate-core/src/test/java/org/hibernate/test/manytomany/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomany/User.java rename to hibernate-core/src/test/java/org/hibernate/test/manytomany/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomany/UserGroup.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/manytomany/UserGroup.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomany/UserGroup.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/manytomany/UserGroup.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomany/batchload/BatchedManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/manytomany/batchload/BatchedManyToManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomany/batchload/BatchedManyToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/manytomany/batchload/BatchedManyToManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomany/batchload/Group.java b/hibernate-core/src/test/java/org/hibernate/test/manytomany/batchload/Group.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomany/batchload/Group.java rename to hibernate-core/src/test/java/org/hibernate/test/manytomany/batchload/Group.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomany/batchload/User.java b/hibernate-core/src/test/java/org/hibernate/test/manytomany/batchload/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomany/batchload/User.java rename to hibernate-core/src/test/java/org/hibernate/test/manytomany/batchload/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomany/batchload/UserGroupBatchLoad.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/manytomany/batchload/UserGroupBatchLoad.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomany/batchload/UserGroupBatchLoad.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/manytomany/batchload/UserGroupBatchLoad.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomany/ordered/Group.java b/hibernate-core/src/test/java/org/hibernate/test/manytomany/ordered/Group.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomany/ordered/Group.java rename to hibernate-core/src/test/java/org/hibernate/test/manytomany/ordered/Group.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomany/ordered/OrderedManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/manytomany/ordered/OrderedManyToManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomany/ordered/OrderedManyToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/manytomany/ordered/OrderedManyToManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomany/ordered/User.java b/hibernate-core/src/test/java/org/hibernate/test/manytomany/ordered/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomany/ordered/User.java rename to hibernate-core/src/test/java/org/hibernate/test/manytomany/ordered/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomany/ordered/UserGroup.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/manytomany/ordered/UserGroup.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomany/ordered/UserGroup.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/manytomany/ordered/UserGroup.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/AbstractManyToManyAssociationClassTest.java b/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/AbstractManyToManyAssociationClassTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/AbstractManyToManyAssociationClassTest.java rename to hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/AbstractManyToManyAssociationClassTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/Group.java b/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/Group.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/Group.java rename to hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/Group.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/Membership.java b/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/Membership.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/Membership.java rename to hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/Membership.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/User.java b/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/User.java rename to hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/compositeid/ManyToManyAssociationClassCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/ManyToManyAssociationClassCompositeIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/compositeid/ManyToManyAssociationClassCompositeIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/ManyToManyAssociationClassCompositeIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/compositeid/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/compositeid/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/compositeid/MembershipWithCompositeId.java b/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/MembershipWithCompositeId.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/compositeid/MembershipWithCompositeId.java rename to hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/MembershipWithCompositeId.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/ManyToManyAssociationClassAssignedIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/ManyToManyAssociationClassAssignedIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/ManyToManyAssociationClassAssignedIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/ManyToManyAssociationClassAssignedIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/map/Group.java b/hibernate-core/src/test/java/org/hibernate/test/map/Group.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/map/Group.java rename to hibernate-core/src/test/java/org/hibernate/test/map/Group.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/map/MapIndexFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/test/map/MapIndexFormulaTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/map/MapIndexFormulaTest.java rename to hibernate-core/src/test/java/org/hibernate/test/map/MapIndexFormulaTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/map/SessionAttribute.java b/hibernate-core/src/test/java/org/hibernate/test/map/SessionAttribute.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/map/SessionAttribute.java rename to hibernate-core/src/test/java/org/hibernate/test/map/SessionAttribute.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/map/User.java b/hibernate-core/src/test/java/org/hibernate/test/map/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/map/User.java rename to hibernate-core/src/test/java/org/hibernate/test/map/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/map/UserGroup.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/map/UserGroup.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/map/UserGroup.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/map/UserGroup.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mapcompelem/Item.java b/hibernate-core/src/test/java/org/hibernate/test/mapcompelem/Item.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mapcompelem/Item.java rename to hibernate-core/src/test/java/org/hibernate/test/mapcompelem/Item.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mapcompelem/MapCompositeElementTest.java b/hibernate-core/src/test/java/org/hibernate/test/mapcompelem/MapCompositeElementTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mapcompelem/MapCompositeElementTest.java rename to hibernate-core/src/test/java/org/hibernate/test/mapcompelem/MapCompositeElementTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mapcompelem/Part.java b/hibernate-core/src/test/java/org/hibernate/test/mapcompelem/Part.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mapcompelem/Part.java rename to hibernate-core/src/test/java/org/hibernate/test/mapcompelem/Part.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mapcompelem/Product.java b/hibernate-core/src/test/java/org/hibernate/test/mapcompelem/Product.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mapcompelem/Product.java rename to hibernate-core/src/test/java/org/hibernate/test/mapcompelem/Product.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mapcompelem/ProductPart.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/mapcompelem/ProductPart.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mapcompelem/ProductPart.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/mapcompelem/ProductPart.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mapelemformula/Group.java b/hibernate-core/src/test/java/org/hibernate/test/mapelemformula/Group.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mapelemformula/Group.java rename to hibernate-core/src/test/java/org/hibernate/test/mapelemformula/Group.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mapelemformula/MapElementFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/test/mapelemformula/MapElementFormulaTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mapelemformula/MapElementFormulaTest.java rename to hibernate-core/src/test/java/org/hibernate/test/mapelemformula/MapElementFormulaTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mapelemformula/User.java b/hibernate-core/src/test/java/org/hibernate/test/mapelemformula/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mapelemformula/User.java rename to hibernate-core/src/test/java/org/hibernate/test/mapelemformula/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mapelemformula/UserGroup.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/mapelemformula/UserGroup.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mapelemformula/UserGroup.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/mapelemformula/UserGroup.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mixed/Document.java b/hibernate-core/src/test/java/org/hibernate/test/mixed/Document.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mixed/Document.java rename to hibernate-core/src/test/java/org/hibernate/test/mixed/Document.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mixed/DocumentInterceptor.java b/hibernate-core/src/test/java/org/hibernate/test/mixed/DocumentInterceptor.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mixed/DocumentInterceptor.java rename to hibernate-core/src/test/java/org/hibernate/test/mixed/DocumentInterceptor.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mixed/Folder.java b/hibernate-core/src/test/java/org/hibernate/test/mixed/Folder.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mixed/Folder.java rename to hibernate-core/src/test/java/org/hibernate/test/mixed/Folder.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mixed/Item.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/mixed/Item.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mixed/Item.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/mixed/Item.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mixed/Item.java b/hibernate-core/src/test/java/org/hibernate/test/mixed/Item.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mixed/Item.java rename to hibernate-core/src/test/java/org/hibernate/test/mixed/Item.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mixed/MixedTest.java b/hibernate-core/src/test/java/org/hibernate/test/mixed/MixedTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mixed/MixedTest.java rename to hibernate-core/src/test/java/org/hibernate/test/mixed/MixedTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mixed/SecureDocument.java b/hibernate-core/src/test/java/org/hibernate/test/mixed/SecureDocument.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mixed/SecureDocument.java rename to hibernate-core/src/test/java/org/hibernate/test/mixed/SecureDocument.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/namingstrategy/Customers.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/Customers.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/namingstrategy/Customers.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/namingstrategy/Customers.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/namingstrategy/Customers.java b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/Customers.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/namingstrategy/Customers.java rename to hibernate-core/src/test/java/org/hibernate/test/namingstrategy/Customers.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/namingstrategy/NamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/NamingStrategyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/namingstrategy/NamingStrategyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/namingstrategy/NamingStrategyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/namingstrategy/TestNamingStrategy.java b/hibernate-core/src/test/java/org/hibernate/test/namingstrategy/TestNamingStrategy.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/namingstrategy/TestNamingStrategy.java rename to hibernate-core/src/test/java/org/hibernate/test/namingstrategy/TestNamingStrategy.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/Child.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/immutable/Child.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/Child.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/immutable/Child.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/ImmutableEntityNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableEntityNaturalIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/ImmutableEntityNaturalIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableEntityNaturalIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/immutable/Parent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/Parent.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/immutable/Parent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/ParentChildWithManyToOne.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/naturalid/immutable/ParentChildWithManyToOne.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/ParentChildWithManyToOne.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/immutable/ParentChildWithManyToOne.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/User.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/naturalid/immutable/User.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/User.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/immutable/User.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/User.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/immutable/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/User.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/immutable/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutableentity/Building.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/immutableentity/Building.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutableentity/Building.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/immutableentity/Building.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/InheritedNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/InheritedNaturalIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/InheritedNaturalIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/InheritedNaturalIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/Principal.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/Principal.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/Principal.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/Principal.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/User.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/User.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/spread/Principal.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/spread/Principal.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/spread/Principal.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/spread/Principal.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/spread/SpreadNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/spread/SpreadNaturalIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/spread/SpreadNaturalIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/spread/SpreadNaturalIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/spread/User.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/spread/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/spread/User.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/spread/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/MutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/mutable/MutableNaturalIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/MutableNaturalIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/mutable/MutableNaturalIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/User.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/naturalid/mutable/User.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/User.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/mutable/User.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/User.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/mutable/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/User.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/mutable/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/cached/AllCached.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/mutable/cached/AllCached.java similarity index 95% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/cached/AllCached.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/mutable/cached/AllCached.java index edc2e6dc0a..4439d84cc1 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/cached/AllCached.java +++ b/hibernate-core/src/test/java/org/hibernate/test/naturalid/mutable/cached/AllCached.java @@ -1,50 +1,50 @@ -package org.hibernate.test.naturalid.mutable.cached; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.NaturalId; -import org.hibernate.annotations.NaturalIdCache; - -/** - * @author Guenther Demetz - * Same as Another.class, excpect that here also the entity class itself is configured for shared cache - */ -@Entity -@NaturalIdCache -@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) -public class AllCached { - private Integer id; - private String name; - - public AllCached() { - } - - public AllCached(String name) { - this.name = name; - } - - @Id - @GeneratedValue( generator = "increment" ) - @GenericGenerator( name = "increment", strategy = "increment" ) - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - @NaturalId(mutable = true) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } +package org.hibernate.test.naturalid.mutable.cached; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; +import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.NaturalId; +import org.hibernate.annotations.NaturalIdCache; + +/** + * @author Guenther Demetz + * Same as Another.class, excpect that here also the entity class itself is configured for shared cache + */ +@Entity +@NaturalIdCache +@Cache(usage = CacheConcurrencyStrategy.READ_WRITE) +public class AllCached { + private Integer id; + private String name; + + public AllCached() { + } + + public AllCached(String name) { + this.name = name; + } + + @Id + @GeneratedValue( generator = "increment" ) + @GenericGenerator( name = "increment", strategy = "increment" ) + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + @NaturalId(mutable = true) + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } \ No newline at end of file diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/cached/Another.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/mutable/cached/Another.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/cached/Another.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/mutable/cached/Another.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/cached/CachedMutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/mutable/cached/CachedMutableNaturalIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/cached/CachedMutableNaturalIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/mutable/cached/CachedMutableNaturalIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/nullable/A.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/nullable/A.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/nullable/A.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/nullable/A.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/nullable/B.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/nullable/B.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/nullable/B.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/nullable/B.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/nullable/C.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/nullable/C.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/nullable/C.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/nullable/C.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/nullable/D.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/nullable/D.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/nullable/D.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/nullable/D.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/nullable/NullableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/nullable/NullableNaturalIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/naturalid/nullable/NullableNaturalIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/naturalid/nullable/NullableNaturalIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/AbstractOperationTestCase.java b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/AbstractOperationTestCase.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/AbstractOperationTestCase.java rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/AbstractOperationTestCase.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/Address.java b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/Competition.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Competition.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/Competition.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Competition.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/Competition.java b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Competition.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/Competition.java rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Competition.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/Competitor.java b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Competitor.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/Competitor.java rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Competitor.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/CreateTest.java b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/CreateTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/CreateTest.java rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/CreateTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/DeleteTest.java b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/DeleteTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/DeleteTest.java rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/DeleteTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/Employer.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Employer.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/Employer.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Employer.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/Employer.java b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Employer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/Employer.java rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Employer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/GetLoadTest.java b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/GetLoadTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/GetLoadTest.java rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/GetLoadTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/MergeTest.java b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/MergeTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/MergeTest.java rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/MergeTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/Node.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Node.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/Node.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Node.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/Node.java b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Node.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/Node.java rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Node.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/NumberedNode.java b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/NumberedNode.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/NumberedNode.java rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/NumberedNode.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/OneToOne.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/OneToOne.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/OneToOne.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/OneToOne.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/OptLockEntity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/OptLockEntity.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/OptLockEntity.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/OptLockEntity.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/Person.java b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/PersonalDetails.java b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/PersonalDetails.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/PersonalDetails.java rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/PersonalDetails.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/SaveOrUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/SaveOrUpdateTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/SaveOrUpdateTest.java rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/SaveOrUpdateTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/TimestampedEntity.java b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/TimestampedEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/TimestampedEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/TimestampedEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/VersionedEntity.java b/hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/VersionedEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/VersionedEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/VersionedEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ondelete/Address.java b/hibernate-core/src/test/java/org/hibernate/test/ondelete/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ondelete/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/ondelete/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ondelete/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/ondelete/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ondelete/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/ondelete/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ondelete/OnDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/test/ondelete/OnDeleteTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ondelete/OnDeleteTest.java rename to hibernate-core/src/test/java/org/hibernate/test/ondelete/OnDeleteTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ondelete/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/ondelete/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ondelete/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/ondelete/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ondelete/Person.java b/hibernate-core/src/test/java/org/hibernate/test/ondelete/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ondelete/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/ondelete/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ondelete/Salesperson.java b/hibernate-core/src/test/java/org/hibernate/test/ondelete/Salesperson.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ondelete/Salesperson.java rename to hibernate-core/src/test/java/org/hibernate/test/ondelete/Salesperson.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/AbstractRecursiveBidirectionalOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/onetomany/AbstractRecursiveBidirectionalOneToManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetomany/AbstractRecursiveBidirectionalOneToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/onetomany/AbstractRecursiveBidirectionalOneToManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/AbstractVersionedRecursiveBidirectionalOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/onetomany/AbstractVersionedRecursiveBidirectionalOneToManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetomany/AbstractVersionedRecursiveBidirectionalOneToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/onetomany/AbstractVersionedRecursiveBidirectionalOneToManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/Child.java b/hibernate-core/src/test/java/org/hibernate/test/onetomany/Child.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetomany/Child.java rename to hibernate-core/src/test/java/org/hibernate/test/onetomany/Child.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/Node.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/onetomany/Node.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetomany/Node.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/onetomany/Node.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/Node.java b/hibernate-core/src/test/java/org/hibernate/test/onetomany/Node.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetomany/Node.java rename to hibernate-core/src/test/java/org/hibernate/test/onetomany/Node.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/OneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/onetomany/OneToManyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetomany/OneToManyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/onetomany/OneToManyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/Parent.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/onetomany/Parent.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetomany/Parent.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/onetomany/Parent.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/onetomany/Parent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetomany/Parent.java rename to hibernate-core/src/test/java/org/hibernate/test/onetomany/Parent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/RecursiveBidirectionalOneToManyCacheTest.java b/hibernate-core/src/test/java/org/hibernate/test/onetomany/RecursiveBidirectionalOneToManyCacheTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetomany/RecursiveBidirectionalOneToManyCacheTest.java rename to hibernate-core/src/test/java/org/hibernate/test/onetomany/RecursiveBidirectionalOneToManyCacheTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/RecursiveBidirectionalOneToManyNoCacheTest.java b/hibernate-core/src/test/java/org/hibernate/test/onetomany/RecursiveBidirectionalOneToManyNoCacheTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetomany/RecursiveBidirectionalOneToManyNoCacheTest.java rename to hibernate-core/src/test/java/org/hibernate/test/onetomany/RecursiveBidirectionalOneToManyNoCacheTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/RecursiveVersionedBidirectionalOneToManyCacheTest.java b/hibernate-core/src/test/java/org/hibernate/test/onetomany/RecursiveVersionedBidirectionalOneToManyCacheTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetomany/RecursiveVersionedBidirectionalOneToManyCacheTest.java rename to hibernate-core/src/test/java/org/hibernate/test/onetomany/RecursiveVersionedBidirectionalOneToManyCacheTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/RecursiveVersionedBidirectionalOneToManyNoCacheTest.java b/hibernate-core/src/test/java/org/hibernate/test/onetomany/RecursiveVersionedBidirectionalOneToManyNoCacheTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetomany/RecursiveVersionedBidirectionalOneToManyNoCacheTest.java rename to hibernate-core/src/test/java/org/hibernate/test/onetomany/RecursiveVersionedBidirectionalOneToManyNoCacheTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/VersionedNode.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/onetomany/VersionedNode.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetomany/VersionedNode.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/onetomany/VersionedNode.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/basic/Child.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/basic/Child.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/basic/Child.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/basic/Child.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/basic/Mapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/onetoone/basic/Mapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/basic/Mapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/basic/Mapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/basic/OneToOneSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/basic/OneToOneSchemaTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/basic/OneToOneSchemaTest.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/basic/OneToOneSchemaTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/basic/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/basic/Parent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/basic/Parent.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/basic/Parent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/formula/Address.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/formula/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/formula/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/formula/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/formula/OneToOneFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/formula/OneToOneFormulaTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/formula/OneToOneFormulaTest.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/formula/OneToOneFormulaTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/formula/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/onetoone/formula/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/formula/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/formula/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/formula/Person.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/formula/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/formula/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/formula/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/joined/Address.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/joined/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/joined/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/joined/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/joined/Entity.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/joined/Entity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/joined/Entity.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/joined/Entity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/joined/JoinedSubclassOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/joined/JoinedSubclassOneToOneTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/joined/JoinedSubclassOneToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/joined/JoinedSubclassOneToOneTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/joined/Org.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/joined/Org.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/joined/Org.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/joined/Org.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/joined/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/onetoone/joined/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/joined/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/joined/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/joined/Person.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/joined/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/joined/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/joined/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/link/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/link/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/link/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/link/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/link/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/link/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/link/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/link/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/link/OneToOneLinkTest.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/link/OneToOneLinkTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/link/OneToOneLinkTest.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/link/OneToOneLinkTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/link/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/onetoone/link/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/link/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/link/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/link/Person.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/link/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/link/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/link/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/nopojo/DynamicMapOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/nopojo/DynamicMapOneToOneTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/nopojo/DynamicMapOneToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/nopojo/DynamicMapOneToOneTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/nopojo/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/onetoone/nopojo/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/nopojo/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/nopojo/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/optional/Address.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/optional/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/optional/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/optional/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/optional/Entity.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/optional/Entity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/optional/Entity.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/optional/Entity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/optional/OptionalOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/optional/OptionalOneToOneTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/optional/OptionalOneToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/optional/OptionalOneToOneTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/optional/Org.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/optional/Org.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/optional/Org.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/optional/Org.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/optional/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/onetoone/optional/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/optional/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/optional/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/optional/Person.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/optional/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/optional/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/optional/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/singletable/Address.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/singletable/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/singletable/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/singletable/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/singletable/Entity.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/singletable/Entity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/singletable/Entity.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/singletable/Entity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/singletable/Org.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/singletable/Org.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/singletable/Org.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/singletable/Org.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/singletable/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/onetoone/singletable/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/singletable/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/singletable/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/singletable/Person.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/singletable/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/onetoone/singletable/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/onetoone/singletable/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/AbstractOperationTestCase.java b/hibernate-core/src/test/java/org/hibernate/test/ops/AbstractOperationTestCase.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/AbstractOperationTestCase.java rename to hibernate-core/src/test/java/org/hibernate/test/ops/AbstractOperationTestCase.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/Address.java b/hibernate-core/src/test/java/org/hibernate/test/ops/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/ops/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/Competition.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/ops/Competition.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/Competition.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/ops/Competition.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/Competition.java b/hibernate-core/src/test/java/org/hibernate/test/ops/Competition.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/Competition.java rename to hibernate-core/src/test/java/org/hibernate/test/ops/Competition.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/Competitor.java b/hibernate-core/src/test/java/org/hibernate/test/ops/Competitor.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/Competitor.java rename to hibernate-core/src/test/java/org/hibernate/test/ops/Competitor.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/CreateTest.java b/hibernate-core/src/test/java/org/hibernate/test/ops/CreateTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/CreateTest.java rename to hibernate-core/src/test/java/org/hibernate/test/ops/CreateTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/DeleteTest.java b/hibernate-core/src/test/java/org/hibernate/test/ops/DeleteTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/DeleteTest.java rename to hibernate-core/src/test/java/org/hibernate/test/ops/DeleteTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/ops/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/ops/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/Employer.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/ops/Employer.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/Employer.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/ops/Employer.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/Employer.java b/hibernate-core/src/test/java/org/hibernate/test/ops/Employer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/Employer.java rename to hibernate-core/src/test/java/org/hibernate/test/ops/Employer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/GetLoadTest.java b/hibernate-core/src/test/java/org/hibernate/test/ops/GetLoadTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/GetLoadTest.java rename to hibernate-core/src/test/java/org/hibernate/test/ops/GetLoadTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/MergeTest.java b/hibernate-core/src/test/java/org/hibernate/test/ops/MergeTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/MergeTest.java rename to hibernate-core/src/test/java/org/hibernate/test/ops/MergeTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/Node.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/ops/Node.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/Node.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/ops/Node.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/Node.java b/hibernate-core/src/test/java/org/hibernate/test/ops/Node.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/Node.java rename to hibernate-core/src/test/java/org/hibernate/test/ops/Node.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/NumberedNode.java b/hibernate-core/src/test/java/org/hibernate/test/ops/NumberedNode.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/NumberedNode.java rename to hibernate-core/src/test/java/org/hibernate/test/ops/NumberedNode.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/OneToOne.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/ops/OneToOne.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/OneToOne.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/ops/OneToOne.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/OptLockEntity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/ops/OptLockEntity.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/OptLockEntity.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/ops/OptLockEntity.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/Person.java b/hibernate-core/src/test/java/org/hibernate/test/ops/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/ops/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/PersonalDetails.java b/hibernate-core/src/test/java/org/hibernate/test/ops/PersonalDetails.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/PersonalDetails.java rename to hibernate-core/src/test/java/org/hibernate/test/ops/PersonalDetails.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/SaveOrUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/test/ops/SaveOrUpdateTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/SaveOrUpdateTest.java rename to hibernate-core/src/test/java/org/hibernate/test/ops/SaveOrUpdateTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/SimpleEntity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/ops/SimpleEntity.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/SimpleEntity.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/ops/SimpleEntity.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/SimpleEntity.java b/hibernate-core/src/test/java/org/hibernate/test/ops/SimpleEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/SimpleEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/ops/SimpleEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/SimpleOpsTest.java b/hibernate-core/src/test/java/org/hibernate/test/ops/SimpleOpsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/SimpleOpsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/ops/SimpleOpsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/TimestampedEntity.java b/hibernate-core/src/test/java/org/hibernate/test/ops/TimestampedEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/TimestampedEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/ops/TimestampedEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/VersionedEntity.java b/hibernate-core/src/test/java/org/hibernate/test/ops/VersionedEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ops/VersionedEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/ops/VersionedEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/optlock/Document.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/optlock/Document.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/optlock/Document.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/optlock/Document.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/optlock/Document.java b/hibernate-core/src/test/java/org/hibernate/test/optlock/Document.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/optlock/Document.java rename to hibernate-core/src/test/java/org/hibernate/test/optlock/Document.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/optlock/OptimisticLockTest.java b/hibernate-core/src/test/java/org/hibernate/test/optlock/OptimisticLockTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/optlock/OptimisticLockTest.java rename to hibernate-core/src/test/java/org/hibernate/test/optlock/OptimisticLockTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/optlock/PublicationDate.java b/hibernate-core/src/test/java/org/hibernate/test/optlock/PublicationDate.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/optlock/PublicationDate.java rename to hibernate-core/src/test/java/org/hibernate/test/optlock/PublicationDate.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ordered/OrderByTest.java b/hibernate-core/src/test/java/org/hibernate/test/ordered/OrderByTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ordered/OrderByTest.java rename to hibernate-core/src/test/java/org/hibernate/test/ordered/OrderByTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ordered/Search.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/ordered/Search.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ordered/Search.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/ordered/Search.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ordered/Search.java b/hibernate-core/src/test/java/org/hibernate/test/ordered/Search.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ordered/Search.java rename to hibernate-core/src/test/java/org/hibernate/test/ordered/Search.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/Mail.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/orphan/Mail.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/Mail.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/orphan/Mail.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/Mail.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/Mail.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/Mail.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/Mail.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/OrphanTest.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/OrphanTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/OrphanTest.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/OrphanTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/Part.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/Part.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/Part.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/Part.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/Product.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/orphan/Product.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/Product.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/orphan/Product.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/Product.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/Product.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/Product.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/Product.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/PropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/PropertyRefTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/PropertyRefTest.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/PropertyRefTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/User.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/orphan/User.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/User.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/orphan/User.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/User.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/User.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/bidirectional/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/bidirectional/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/bidirectional/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/bidirectional/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/bidirectional/EmployeeInfo.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/bidirectional/EmployeeInfo.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/bidirectional/EmployeeInfo.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/bidirectional/EmployeeInfo.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/bidirectional/Mapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/bidirectional/Mapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/bidirectional/Mapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/bidirectional/Mapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/composite/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/composite/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/composite/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/composite/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/composite/EmployeeInfo.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/composite/EmployeeInfo.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/composite/EmployeeInfo.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/composite/EmployeeInfo.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/composite/Mapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/composite/Mapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/composite/Mapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/composite/Mapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/EmployeeInfo.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/EmployeeInfo.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/EmployeeInfo.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/EmployeeInfo.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/Mapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/Mapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/Mapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/Mapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/EmployeeInfo.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/EmployeeInfo.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/EmployeeInfo.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/EmployeeInfo.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/Mapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/Mapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/Mapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/Mapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/bidirectional/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/pk/bidirectional/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/bidirectional/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/pk/bidirectional/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/bidirectional/EmployeeInfo.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/pk/bidirectional/EmployeeInfo.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/bidirectional/EmployeeInfo.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/pk/bidirectional/EmployeeInfo.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/bidirectional/Mapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/pk/bidirectional/Mapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/bidirectional/Mapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/pk/bidirectional/Mapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/unidirectional/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/pk/unidirectional/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/unidirectional/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/pk/unidirectional/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/unidirectional/EmployeeInfo.java b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/pk/unidirectional/EmployeeInfo.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/unidirectional/EmployeeInfo.java rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/pk/unidirectional/EmployeeInfo.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/unidirectional/Mapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/pk/unidirectional/Mapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/unidirectional/Mapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/orphan/one2one/pk/unidirectional/Mapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/pagination/DataPoint.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/pagination/DataPoint.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/pagination/DataPoint.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/pagination/DataPoint.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/pagination/DataPoint.java b/hibernate-core/src/test/java/org/hibernate/test/pagination/DataPoint.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/pagination/DataPoint.java rename to hibernate-core/src/test/java/org/hibernate/test/pagination/DataPoint.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/pagination/DistinctSelectTest.java b/hibernate-core/src/test/java/org/hibernate/test/pagination/DistinctSelectTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/pagination/DistinctSelectTest.java rename to hibernate-core/src/test/java/org/hibernate/test/pagination/DistinctSelectTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/pagination/Entry.java b/hibernate-core/src/test/java/org/hibernate/test/pagination/Entry.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/pagination/Entry.java rename to hibernate-core/src/test/java/org/hibernate/test/pagination/Entry.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/pagination/EntryTag.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/pagination/EntryTag.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/pagination/EntryTag.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/pagination/EntryTag.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/pagination/PaginationTest.java b/hibernate-core/src/test/java/org/hibernate/test/pagination/PaginationTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/pagination/PaginationTest.java rename to hibernate-core/src/test/java/org/hibernate/test/pagination/PaginationTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/pagination/Tag.java b/hibernate-core/src/test/java/org/hibernate/test/pagination/Tag.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/pagination/Tag.java rename to hibernate-core/src/test/java/org/hibernate/test/pagination/Tag.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/basic/Account.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/basic/Account.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/basic/Account.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/basic/Account.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/basic/Address.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/basic/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/basic/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/basic/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/basic/Group.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/basic/Group.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/basic/Group.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/basic/Group.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/basic/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/propertyref/basic/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/basic/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/basic/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/basic/Person.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/basic/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/basic/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/basic/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/basic/PropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/basic/PropertyRefTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/basic/PropertyRefTest.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/basic/PropertyRefTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/cachedcollections/CachedPropertyRefCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/cachedcollections/CachedPropertyRefCollectionTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/cachedcollections/CachedPropertyRefCollectionTest.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/cachedcollections/CachedPropertyRefCollectionTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/cachedcollections/ManagedObject.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/cachedcollections/ManagedObject.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/cachedcollections/ManagedObject.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/cachedcollections/ManagedObject.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/cachedcollections/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/propertyref/cachedcollections/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/cachedcollections/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/cachedcollections/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/complete/Account.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/component/complete/Account.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/complete/Account.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/component/complete/Account.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/complete/CompleteComponentPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/component/complete/CompleteComponentPropertyRefTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/complete/CompleteComponentPropertyRefTest.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/component/complete/CompleteComponentPropertyRefTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/complete/Identity.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/component/complete/Identity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/complete/Identity.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/component/complete/Identity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/complete/Mapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/propertyref/component/complete/Mapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/complete/Mapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/component/complete/Mapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/complete/Person.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/component/complete/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/complete/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/component/complete/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/partial/Account.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/component/partial/Account.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/partial/Account.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/component/partial/Account.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/partial/Identity.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/component/partial/Identity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/partial/Identity.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/component/partial/Identity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/partial/Mapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/propertyref/component/partial/Mapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/partial/Mapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/component/partial/Mapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/partial/PartialComponentPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/component/partial/PartialComponentPropertyRefTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/partial/PartialComponentPropertyRefTest.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/component/partial/PartialComponentPropertyRefTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/partial/Person.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/component/partial/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/partial/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/component/partial/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/discrim/Account.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/Account.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/discrim/Account.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/Account.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/discrim/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/discrim/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/discrim/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/discrim/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/discrim/Person.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/discrim/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/joined/Account.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/joined/Account.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/joined/Account.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/joined/Account.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/joined/BankAccount.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/joined/BankAccount.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/joined/BankAccount.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/joined/BankAccount.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/joined/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/joined/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/joined/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/joined/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/joined/Person.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/joined/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/joined/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/joined/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/union/Account.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/union/Account.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/union/Account.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/union/Account.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/union/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/union/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/union/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/union/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/union/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/union/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/union/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/union/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/union/Person.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/union/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/union/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/union/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java rename to hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/proxy/Container.java b/hibernate-core/src/test/java/org/hibernate/test/proxy/Container.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/proxy/Container.java rename to hibernate-core/src/test/java/org/hibernate/test/proxy/Container.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/proxy/DataPoint.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/proxy/DataPoint.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/proxy/DataPoint.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/proxy/DataPoint.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/proxy/DataPoint.java b/hibernate-core/src/test/java/org/hibernate/test/proxy/DataPoint.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/proxy/DataPoint.java rename to hibernate-core/src/test/java/org/hibernate/test/proxy/DataPoint.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/proxy/Info.java b/hibernate-core/src/test/java/org/hibernate/test/proxy/Info.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/proxy/Info.java rename to hibernate-core/src/test/java/org/hibernate/test/proxy/Info.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/proxy/Owner.java b/hibernate-core/src/test/java/org/hibernate/test/proxy/Owner.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/proxy/Owner.java rename to hibernate-core/src/test/java/org/hibernate/test/proxy/Owner.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/proxy/ProxyTest.java b/hibernate-core/src/test/java/org/hibernate/test/proxy/ProxyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/proxy/ProxyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/proxy/ProxyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/AbstractQueryCacheResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/test/querycache/AbstractQueryCacheResultTransformerTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/querycache/AbstractQueryCacheResultTransformerTest.java rename to hibernate-core/src/test/java/org/hibernate/test/querycache/AbstractQueryCacheResultTransformerTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/Address.java b/hibernate-core/src/test/java/org/hibernate/test/querycache/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/querycache/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/querycache/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/Course.java b/hibernate-core/src/test/java/org/hibernate/test/querycache/Course.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/querycache/Course.java rename to hibernate-core/src/test/java/org/hibernate/test/querycache/Course.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/CourseMeeting.java b/hibernate-core/src/test/java/org/hibernate/test/querycache/CourseMeeting.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/querycache/CourseMeeting.java rename to hibernate-core/src/test/java/org/hibernate/test/querycache/CourseMeeting.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/CourseMeetingId.java b/hibernate-core/src/test/java/org/hibernate/test/querycache/CourseMeetingId.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/querycache/CourseMeetingId.java rename to hibernate-core/src/test/java/org/hibernate/test/querycache/CourseMeetingId.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/CriteriaQueryCacheIgnoreResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/test/querycache/CriteriaQueryCacheIgnoreResultTransformerTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/querycache/CriteriaQueryCacheIgnoreResultTransformerTest.java rename to hibernate-core/src/test/java/org/hibernate/test/querycache/CriteriaQueryCacheIgnoreResultTransformerTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/CriteriaQueryCacheNormalResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/test/querycache/CriteriaQueryCacheNormalResultTransformerTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/querycache/CriteriaQueryCacheNormalResultTransformerTest.java rename to hibernate-core/src/test/java/org/hibernate/test/querycache/CriteriaQueryCacheNormalResultTransformerTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/CriteriaQueryCachePutResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/test/querycache/CriteriaQueryCachePutResultTransformerTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/querycache/CriteriaQueryCachePutResultTransformerTest.java rename to hibernate-core/src/test/java/org/hibernate/test/querycache/CriteriaQueryCachePutResultTransformerTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/Enrolment.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/querycache/Enrolment.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/querycache/Enrolment.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/querycache/Enrolment.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/Enrolment.java b/hibernate-core/src/test/java/org/hibernate/test/querycache/Enrolment.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/querycache/Enrolment.java rename to hibernate-core/src/test/java/org/hibernate/test/querycache/Enrolment.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/HqlQueryCacheIgnoreResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/test/querycache/HqlQueryCacheIgnoreResultTransformerTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/querycache/HqlQueryCacheIgnoreResultTransformerTest.java rename to hibernate-core/src/test/java/org/hibernate/test/querycache/HqlQueryCacheIgnoreResultTransformerTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/HqlQueryCacheNormalResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/test/querycache/HqlQueryCacheNormalResultTransformerTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/querycache/HqlQueryCacheNormalResultTransformerTest.java rename to hibernate-core/src/test/java/org/hibernate/test/querycache/HqlQueryCacheNormalResultTransformerTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/HqlQueryCachePutResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/test/querycache/HqlQueryCachePutResultTransformerTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/querycache/HqlQueryCachePutResultTransformerTest.java rename to hibernate-core/src/test/java/org/hibernate/test/querycache/HqlQueryCachePutResultTransformerTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/Item.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/querycache/Item.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/querycache/Item.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/querycache/Item.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/Item.java b/hibernate-core/src/test/java/org/hibernate/test/querycache/Item.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/querycache/Item.java rename to hibernate-core/src/test/java/org/hibernate/test/querycache/Item.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/PersonName.java b/hibernate-core/src/test/java/org/hibernate/test/querycache/PersonName.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/querycache/PersonName.java rename to hibernate-core/src/test/java/org/hibernate/test/querycache/PersonName.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/QueryCacheTest.java b/hibernate-core/src/test/java/org/hibernate/test/querycache/QueryCacheTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/querycache/QueryCacheTest.java rename to hibernate-core/src/test/java/org/hibernate/test/querycache/QueryCacheTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/Student.java b/hibernate-core/src/test/java/org/hibernate/test/querycache/Student.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/querycache/Student.java rename to hibernate-core/src/test/java/org/hibernate/test/querycache/Student.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/StudentDTO.java b/hibernate-core/src/test/java/org/hibernate/test/querycache/StudentDTO.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/querycache/StudentDTO.java rename to hibernate-core/src/test/java/org/hibernate/test/querycache/StudentDTO.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/queryplan/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/queryplan/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/queryplan/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/queryplan/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/queryplan/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/queryplan/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/GetHqlQueryPlanTest.java b/hibernate-core/src/test/java/org/hibernate/test/queryplan/GetHqlQueryPlanTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/queryplan/GetHqlQueryPlanTest.java rename to hibernate-core/src/test/java/org/hibernate/test/queryplan/GetHqlQueryPlanTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/Joined.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/queryplan/Joined.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/queryplan/Joined.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/queryplan/Joined.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/NativeSQLQueryPlanEqualsTest.java b/hibernate-core/src/test/java/org/hibernate/test/queryplan/NativeSQLQueryPlanEqualsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/queryplan/NativeSQLQueryPlanEqualsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/queryplan/NativeSQLQueryPlanEqualsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/NativeSQLQueryReturnEqualsAndHashCodeTest.java b/hibernate-core/src/test/java/org/hibernate/test/queryplan/NativeSQLQueryReturnEqualsAndHashCodeTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/queryplan/NativeSQLQueryReturnEqualsAndHashCodeTest.java rename to hibernate-core/src/test/java/org/hibernate/test/queryplan/NativeSQLQueryReturnEqualsAndHashCodeTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/Person.java b/hibernate-core/src/test/java/org/hibernate/test/queryplan/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/queryplan/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/queryplan/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/User.java b/hibernate-core/src/test/java/org/hibernate/test/queryplan/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/queryplan/User.java rename to hibernate-core/src/test/java/org/hibernate/test/queryplan/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/filter-defs.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/queryplan/filter-defs.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/queryplan/filter-defs.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/queryplan/filter-defs.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/AbstractReadOnlyTest.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/AbstractReadOnlyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/AbstractReadOnlyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/readonly/AbstractReadOnlyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/Container.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/Container.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/Container.java rename to hibernate-core/src/test/java/org/hibernate/test/readonly/Container.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/Course.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/Course.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/Course.java rename to hibernate-core/src/test/java/org/hibernate/test/readonly/Course.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/DataPoint.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/readonly/DataPoint.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/DataPoint.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/readonly/DataPoint.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/DataPoint.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/DataPoint.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/DataPoint.java rename to hibernate-core/src/test/java/org/hibernate/test/readonly/DataPoint.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/Enrolment.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/readonly/Enrolment.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/Enrolment.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/readonly/Enrolment.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/Enrolment.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/Enrolment.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/Enrolment.java rename to hibernate-core/src/test/java/org/hibernate/test/readonly/Enrolment.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/Info.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/Info.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/Info.java rename to hibernate-core/src/test/java/org/hibernate/test/readonly/Info.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/Owner.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/Owner.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/Owner.java rename to hibernate-core/src/test/java/org/hibernate/test/readonly/Owner.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyCriteriaQueryTest.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/ReadOnlyCriteriaQueryTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyCriteriaQueryTest.java rename to hibernate-core/src/test/java/org/hibernate/test/readonly/ReadOnlyCriteriaQueryTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyProxyTest.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/ReadOnlyProxyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyProxyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/readonly/ReadOnlyProxyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlySessionLazyNonLazyTest.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/ReadOnlySessionLazyNonLazyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlySessionLazyNonLazyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/readonly/ReadOnlySessionLazyNonLazyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlySessionTest.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/ReadOnlySessionTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlySessionTest.java rename to hibernate-core/src/test/java/org/hibernate/test/readonly/ReadOnlySessionTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyTest.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/ReadOnlyTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/readonly/ReadOnlyTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyVersionedNodesTest.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/ReadOnlyVersionedNodesTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyVersionedNodesTest.java rename to hibernate-core/src/test/java/org/hibernate/test/readonly/ReadOnlyVersionedNodesTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/Student.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/Student.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/Student.java rename to hibernate-core/src/test/java/org/hibernate/test/readonly/Student.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/StudentDTO.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/StudentDTO.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/StudentDTO.java rename to hibernate-core/src/test/java/org/hibernate/test/readonly/StudentDTO.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/TextHolder.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/readonly/TextHolder.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/TextHolder.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/readonly/TextHolder.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/TextHolder.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/TextHolder.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/TextHolder.java rename to hibernate-core/src/test/java/org/hibernate/test/readonly/TextHolder.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/VersionedNode.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/readonly/VersionedNode.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/VersionedNode.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/readonly/VersionedNode.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/VersionedNode.java b/hibernate-core/src/test/java/org/hibernate/test/readonly/VersionedNode.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/readonly/VersionedNode.java rename to hibernate-core/src/test/java/org/hibernate/test/readonly/VersionedNode.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/reattachment/Child.java b/hibernate-core/src/test/java/org/hibernate/test/reattachment/Child.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/reattachment/Child.java rename to hibernate-core/src/test/java/org/hibernate/test/reattachment/Child.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/reattachment/CollectionReattachmentTest.java b/hibernate-core/src/test/java/org/hibernate/test/reattachment/CollectionReattachmentTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/reattachment/CollectionReattachmentTest.java rename to hibernate-core/src/test/java/org/hibernate/test/reattachment/CollectionReattachmentTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/reattachment/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/reattachment/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/reattachment/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/reattachment/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/reattachment/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/reattachment/Parent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/reattachment/Parent.java rename to hibernate-core/src/test/java/org/hibernate/test/reattachment/Parent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/reattachment/ProxyReattachmentTest.java b/hibernate-core/src/test/java/org/hibernate/test/reattachment/ProxyReattachmentTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/reattachment/ProxyReattachmentTest.java rename to hibernate-core/src/test/java/org/hibernate/test/reattachment/ProxyReattachmentTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/resulttransformer/Contract.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/resulttransformer/Contract.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/resulttransformer/Contract.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/resulttransformer/Contract.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/resulttransformer/Contract.java b/hibernate-core/src/test/java/org/hibernate/test/resulttransformer/Contract.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/resulttransformer/Contract.java rename to hibernate-core/src/test/java/org/hibernate/test/resulttransformer/Contract.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/resulttransformer/PartnerA.java b/hibernate-core/src/test/java/org/hibernate/test/resulttransformer/PartnerA.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/resulttransformer/PartnerA.java rename to hibernate-core/src/test/java/org/hibernate/test/resulttransformer/PartnerA.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/resulttransformer/PartnerB.java b/hibernate-core/src/test/java/org/hibernate/test/resulttransformer/PartnerB.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/resulttransformer/PartnerB.java rename to hibernate-core/src/test/java/org/hibernate/test/resulttransformer/PartnerB.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/resulttransformer/ResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/test/resulttransformer/ResultTransformerTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/resulttransformer/ResultTransformerTest.java rename to hibernate-core/src/test/java/org/hibernate/test/resulttransformer/ResultTransformerTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/rowid/Point.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/rowid/Point.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/rowid/Point.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/rowid/Point.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/rowid/Point.java b/hibernate-core/src/test/java/org/hibernate/test/rowid/Point.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/rowid/Point.java rename to hibernate-core/src/test/java/org/hibernate/test/rowid/Point.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/rowid/RowIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/rowid/RowIdTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/rowid/RowIdTest.java rename to hibernate-core/src/test/java/org/hibernate/test/rowid/RowIdTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/rowid/RowIdType.java b/hibernate-core/src/test/java/org/hibernate/test/rowid/RowIdType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/rowid/RowIdType.java rename to hibernate-core/src/test/java/org/hibernate/test/rowid/RowIdType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sorted/Search.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/sorted/Search.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sorted/Search.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/sorted/Search.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sorted/Search.java b/hibernate-core/src/test/java/org/hibernate/test/sorted/Search.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sorted/Search.java rename to hibernate-core/src/test/java/org/hibernate/test/sorted/Search.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sorted/SortTest.java b/hibernate-core/src/test/java/org/hibernate/test/sorted/SortTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sorted/SortTest.java rename to hibernate-core/src/test/java/org/hibernate/test/sorted/SortTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/AutoDiscoveryTest.java b/hibernate-core/src/test/java/org/hibernate/test/sql/autodiscovery/AutoDiscoveryTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/AutoDiscoveryTest.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/autodiscovery/AutoDiscoveryTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/Group.java b/hibernate-core/src/test/java/org/hibernate/test/sql/autodiscovery/Group.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/Group.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/autodiscovery/Group.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/Membership.java b/hibernate-core/src/test/java/org/hibernate/test/sql/autodiscovery/Membership.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/Membership.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/autodiscovery/Membership.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/User.java b/hibernate-core/src/test/java/org/hibernate/test/sql/autodiscovery/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/User.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/autodiscovery/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/check/ExceptionCheckingEntity.java b/hibernate-core/src/test/java/org/hibernate/test/sql/check/ExceptionCheckingEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/check/ExceptionCheckingEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/check/ExceptionCheckingEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/check/OracleCheckStyleTest.java b/hibernate-core/src/test/java/org/hibernate/test/sql/check/OracleCheckStyleTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/check/OracleCheckStyleTest.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/check/OracleCheckStyleTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/check/ParamCheckingEntity.java b/hibernate-core/src/test/java/org/hibernate/test/sql/check/ParamCheckingEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/check/ParamCheckingEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/check/ParamCheckingEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/check/ResultCheckStyleTest.java b/hibernate-core/src/test/java/org/hibernate/test/sql/check/ResultCheckStyleTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/check/ResultCheckStyleTest.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/check/ResultCheckStyleTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/check/oracle-mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/sql/check/oracle-mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/check/oracle-mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/sql/check/oracle-mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/Dimension.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/Dimension.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/Dimension.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/Dimension.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/Employment.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/Employment.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/Employment.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/Employment.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/Group.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/Group.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/Group.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/Group.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/ImageHolder.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/ImageHolder.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/ImageHolder.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/ImageHolder.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/MonetaryAmount.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/MonetaryAmount.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/MonetaryAmount.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/MonetaryAmount.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/MonetaryAmountUserType.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/MonetaryAmountUserType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/MonetaryAmountUserType.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/MonetaryAmountUserType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/Order.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/Order.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/Order.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/Order.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/Organization.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/Organization.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/Organization.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/Organization.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/Person.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/Product.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/Product.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/Product.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/Product.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/SpaceShip.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/SpaceShip.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/SpaceShip.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/SpaceShip.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/Speech.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/Speech.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/Speech.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/Speech.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/TextHolder.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/TextHolder.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/TextHolder.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/TextHolder.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/CustomStoredProcTestSupport.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/CustomStoredProcTestSupport.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/CustomStoredProcTestSupport.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/CustomStoredProcTestSupport.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/mysql/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/mysql/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/mysql/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/mysql/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/oracle/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/oracle/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/oracle/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/oracle/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/oracle/StoredProcedures.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/oracle/StoredProcedures.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/oracle/StoredProcedures.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/oracle/StoredProcedures.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/sqlserver/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/sqlserver/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/sqlserver/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/sqlserver/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/sqlserver/SQLServerCustomSQLTest.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/sqlserver/SQLServerCustomSQLTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/sqlserver/SQLServerCustomSQLTest.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/sqlserver/SQLServerCustomSQLTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/sybase/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/sybase/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/sybase/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/sybase/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/identity/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/identity/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/identity/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/identity/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/quotedidentifiers/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/quotedidentifiers/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/quotedidentifiers/Person.java b/hibernate-core/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/quotedidentifiers/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stateless/Contact.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/stateless/Contact.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stateless/Contact.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/stateless/Contact.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stateless/Contact.java b/hibernate-core/src/test/java/org/hibernate/test/stateless/Contact.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stateless/Contact.java rename to hibernate-core/src/test/java/org/hibernate/test/stateless/Contact.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stateless/Country.java b/hibernate-core/src/test/java/org/hibernate/test/stateless/Country.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stateless/Country.java rename to hibernate-core/src/test/java/org/hibernate/test/stateless/Country.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stateless/Document.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/stateless/Document.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stateless/Document.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/stateless/Document.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stateless/Document.java b/hibernate-core/src/test/java/org/hibernate/test/stateless/Document.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stateless/Document.java rename to hibernate-core/src/test/java/org/hibernate/test/stateless/Document.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stateless/Org.java b/hibernate-core/src/test/java/org/hibernate/test/stateless/Org.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stateless/Org.java rename to hibernate-core/src/test/java/org/hibernate/test/stateless/Org.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stateless/Paper.java b/hibernate-core/src/test/java/org/hibernate/test/stateless/Paper.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stateless/Paper.java rename to hibernate-core/src/test/java/org/hibernate/test/stateless/Paper.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stateless/StatelessSessionQueryTest.java b/hibernate-core/src/test/java/org/hibernate/test/stateless/StatelessSessionQueryTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stateless/StatelessSessionQueryTest.java rename to hibernate-core/src/test/java/org/hibernate/test/stateless/StatelessSessionQueryTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stateless/StatelessSessionTest.java b/hibernate-core/src/test/java/org/hibernate/test/stateless/StatelessSessionTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stateless/StatelessSessionTest.java rename to hibernate-core/src/test/java/org/hibernate/test/stateless/StatelessSessionTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stateless/fetching/Mappings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/stateless/fetching/Mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stateless/fetching/Mappings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/stateless/fetching/Mappings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stateless/fetching/Resource.java b/hibernate-core/src/test/java/org/hibernate/test/stateless/fetching/Resource.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stateless/fetching/Resource.java rename to hibernate-core/src/test/java/org/hibernate/test/stateless/fetching/Resource.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stateless/fetching/StatelessSessionFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/test/stateless/fetching/StatelessSessionFetchingTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stateless/fetching/StatelessSessionFetchingTest.java rename to hibernate-core/src/test/java/org/hibernate/test/stateless/fetching/StatelessSessionFetchingTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stateless/fetching/Task.java b/hibernate-core/src/test/java/org/hibernate/test/stateless/fetching/Task.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stateless/fetching/Task.java rename to hibernate-core/src/test/java/org/hibernate/test/stateless/fetching/Task.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stateless/fetching/User.java b/hibernate-core/src/test/java/org/hibernate/test/stateless/fetching/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stateless/fetching/User.java rename to hibernate-core/src/test/java/org/hibernate/test/stateless/fetching/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stats/Continent.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/stats/Continent.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stats/Continent.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/stats/Continent.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stats/Continent.java b/hibernate-core/src/test/java/org/hibernate/test/stats/Continent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stats/Continent.java rename to hibernate-core/src/test/java/org/hibernate/test/stats/Continent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stats/Continent2.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/stats/Continent2.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stats/Continent2.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/stats/Continent2.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stats/Country.java b/hibernate-core/src/test/java/org/hibernate/test/stats/Country.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stats/Country.java rename to hibernate-core/src/test/java/org/hibernate/test/stats/Country.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stats/Locality.java b/hibernate-core/src/test/java/org/hibernate/test/stats/Locality.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stats/Locality.java rename to hibernate-core/src/test/java/org/hibernate/test/stats/Locality.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stats/Province.java b/hibernate-core/src/test/java/org/hibernate/test/stats/Province.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stats/Province.java rename to hibernate-core/src/test/java/org/hibernate/test/stats/Province.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stats/SessionStatsTest.java b/hibernate-core/src/test/java/org/hibernate/test/stats/SessionStatsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stats/SessionStatsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/stats/SessionStatsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stats/State.java b/hibernate-core/src/test/java/org/hibernate/test/stats/State.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stats/State.java rename to hibernate-core/src/test/java/org/hibernate/test/stats/State.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stats/StatsTest.java b/hibernate-core/src/test/java/org/hibernate/test/stats/StatsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/stats/StatsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/stats/StatsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/subclassfilter/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/subclassfilter/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/DiscrimSubclassFilterTest.java b/hibernate-core/src/test/java/org/hibernate/test/subclassfilter/DiscrimSubclassFilterTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/DiscrimSubclassFilterTest.java rename to hibernate-core/src/test/java/org/hibernate/test/subclassfilter/DiscrimSubclassFilterTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/subclassfilter/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/subclassfilter/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/JoinedSubclassFilterTest.java b/hibernate-core/src/test/java/org/hibernate/test/subclassfilter/JoinedSubclassFilterTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/JoinedSubclassFilterTest.java rename to hibernate-core/src/test/java/org/hibernate/test/subclassfilter/JoinedSubclassFilterTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/Person.java b/hibernate-core/src/test/java/org/hibernate/test/subclassfilter/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/subclassfilter/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/UnionSubclassFilterTest.java b/hibernate-core/src/test/java/org/hibernate/test/subclassfilter/UnionSubclassFilterTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/UnionSubclassFilterTest.java rename to hibernate-core/src/test/java/org/hibernate/test/subclassfilter/UnionSubclassFilterTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/discrim-subclass.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/subclassfilter/discrim-subclass.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/discrim-subclass.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/subclassfilter/discrim-subclass.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/joined-subclass.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/subclassfilter/joined-subclass.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/joined-subclass.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/subclassfilter/joined-subclass.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/union-subclass.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/subclassfilter/union-subclass.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/union-subclass.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/subclassfilter/union-subclass.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subselect/Alien.java b/hibernate-core/src/test/java/org/hibernate/test/subselect/Alien.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/subselect/Alien.java rename to hibernate-core/src/test/java/org/hibernate/test/subselect/Alien.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subselect/Being.java b/hibernate-core/src/test/java/org/hibernate/test/subselect/Being.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/subselect/Being.java rename to hibernate-core/src/test/java/org/hibernate/test/subselect/Being.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subselect/Beings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/subselect/Beings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/subselect/Beings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/subselect/Beings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subselect/Human.java b/hibernate-core/src/test/java/org/hibernate/test/subselect/Human.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/subselect/Human.java rename to hibernate-core/src/test/java/org/hibernate/test/subselect/Human.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subselect/SubselectTest.java b/hibernate-core/src/test/java/org/hibernate/test/subselect/SubselectTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/subselect/SubselectTest.java rename to hibernate-core/src/test/java/org/hibernate/test/subselect/SubselectTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subselectfetch/Child.java b/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/Child.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/subselectfetch/Child.java rename to hibernate-core/src/test/java/org/hibernate/test/subselectfetch/Child.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subselectfetch/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/Parent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/subselectfetch/Parent.java rename to hibernate-core/src/test/java/org/hibernate/test/subselectfetch/Parent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subselectfetch/ParentChild.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/ParentChild.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/subselectfetch/ParentChild.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/subselectfetch/ParentChild.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subselectfetch/SubselectFetchTest.java b/hibernate-core/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/subselectfetch/SubselectFetchTest.java rename to hibernate-core/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ternary/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/ternary/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ternary/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/ternary/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ternary/Site.java b/hibernate-core/src/test/java/org/hibernate/test/ternary/Site.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ternary/Site.java rename to hibernate-core/src/test/java/org/hibernate/test/ternary/Site.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ternary/Ternary.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/ternary/Ternary.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ternary/Ternary.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/ternary/Ternary.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ternary/TernaryTest.java b/hibernate-core/src/test/java/org/hibernate/test/ternary/TernaryTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ternary/TernaryTest.java rename to hibernate-core/src/test/java/org/hibernate/test/ternary/TernaryTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/timestamp/Person.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/timestamp/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/timestamp/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/timestamp/TimestampTest.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/TimestampTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/timestamp/TimestampTest.java rename to hibernate-core/src/test/java/org/hibernate/test/timestamp/TimestampTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/timestamp/User.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/timestamp/User.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/timestamp/User.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/timestamp/User.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/timestamp/User.java b/hibernate-core/src/test/java/org/hibernate/test/timestamp/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/timestamp/User.java rename to hibernate-core/src/test/java/org/hibernate/test/timestamp/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/tm/CMTTest.java b/hibernate-core/src/test/java/org/hibernate/test/tm/CMTTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/tm/CMTTest.java rename to hibernate-core/src/test/java/org/hibernate/test/tm/CMTTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/tm/Item.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/tm/Item.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/tm/Item.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/tm/Item.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/tm/TransactionTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/test/tm/TransactionTimeoutTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/tm/TransactionTimeoutTest.java rename to hibernate-core/src/test/java/org/hibernate/test/tm/TransactionTimeoutTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typedescriptor/ByteTest.java b/hibernate-core/src/test/java/org/hibernate/test/typedescriptor/ByteTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typedescriptor/ByteTest.java rename to hibernate-core/src/test/java/org/hibernate/test/typedescriptor/ByteTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typedescriptor/CharInNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/test/typedescriptor/CharInNativeQueryTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typedescriptor/CharInNativeQueryTest.java rename to hibernate-core/src/test/java/org/hibernate/test/typedescriptor/CharInNativeQueryTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typedescriptor/Issue.java b/hibernate-core/src/test/java/org/hibernate/test/typedescriptor/Issue.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typedescriptor/Issue.java rename to hibernate-core/src/test/java/org/hibernate/test/typedescriptor/Issue.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typedescriptor/VariousTypesEntity.java b/hibernate-core/src/test/java/org/hibernate/test/typedescriptor/VariousTypesEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typedescriptor/VariousTypesEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/typedescriptor/VariousTypesEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typedmanytoone/Address.java b/hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typedmanytoone/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typedmanytoone/AddressId.java b/hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/AddressId.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typedmanytoone/AddressId.java rename to hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/AddressId.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typedmanytoone/Customer.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/Customer.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typedmanytoone/Customer.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/Customer.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typedmanytoone/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typedmanytoone/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typedmanytoone/TypedManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/TypedManyToOneTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typedmanytoone/TypedManyToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/TypedManyToOneTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typedonetoone/Address.java b/hibernate-core/src/test/java/org/hibernate/test/typedonetoone/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typedonetoone/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/typedonetoone/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typedonetoone/AddressId.java b/hibernate-core/src/test/java/org/hibernate/test/typedonetoone/AddressId.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typedonetoone/AddressId.java rename to hibernate-core/src/test/java/org/hibernate/test/typedonetoone/AddressId.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typedonetoone/Customer.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/typedonetoone/Customer.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typedonetoone/Customer.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/typedonetoone/Customer.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typedonetoone/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/typedonetoone/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typedonetoone/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/typedonetoone/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typedonetoone/TypedOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/typedonetoone/TypedOneToOneTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typedonetoone/TypedOneToOneTest.java rename to hibernate-core/src/test/java/org/hibernate/test/typedonetoone/TypedOneToOneTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/Entity.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/typeoverride/Entity.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/Entity.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/typeoverride/Entity.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/Entity.java b/hibernate-core/src/test/java/org/hibernate/test/typeoverride/Entity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/Entity.java rename to hibernate-core/src/test/java/org/hibernate/test/typeoverride/Entity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/H2DialectOverridePrefixedVarcharSqlTypeDesc.java b/hibernate-core/src/test/java/org/hibernate/test/typeoverride/H2DialectOverridePrefixedVarcharSqlTypeDesc.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/H2DialectOverridePrefixedVarcharSqlTypeDesc.java rename to hibernate-core/src/test/java/org/hibernate/test/typeoverride/H2DialectOverridePrefixedVarcharSqlTypeDesc.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/H2DialectOverrideVarcharSqlCode.java b/hibernate-core/src/test/java/org/hibernate/test/typeoverride/H2DialectOverrideVarcharSqlCode.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/H2DialectOverrideVarcharSqlCode.java rename to hibernate-core/src/test/java/org/hibernate/test/typeoverride/H2DialectOverrideVarcharSqlCode.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/StoredPrefixedStringType.java b/hibernate-core/src/test/java/org/hibernate/test/typeoverride/StoredPrefixedStringType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/StoredPrefixedStringType.java rename to hibernate-core/src/test/java/org/hibernate/test/typeoverride/StoredPrefixedStringType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/TypeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/test/typeoverride/TypeOverrideTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/TypeOverrideTest.java rename to hibernate-core/src/test/java/org/hibernate/test/typeoverride/TypeOverrideTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typeparameters/DefaultValueIntegerType.java b/hibernate-core/src/test/java/org/hibernate/test/typeparameters/DefaultValueIntegerType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typeparameters/DefaultValueIntegerType.java rename to hibernate-core/src/test/java/org/hibernate/test/typeparameters/DefaultValueIntegerType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typeparameters/TypeParameterTest.java b/hibernate-core/src/test/java/org/hibernate/test/typeparameters/TypeParameterTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typeparameters/TypeParameterTest.java rename to hibernate-core/src/test/java/org/hibernate/test/typeparameters/TypeParameterTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typeparameters/Typedef.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/typeparameters/Typedef.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typeparameters/Typedef.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/typeparameters/Typedef.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typeparameters/Widget.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/typeparameters/Widget.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typeparameters/Widget.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/typeparameters/Widget.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typeparameters/Widget.java b/hibernate-core/src/test/java/org/hibernate/test/typeparameters/Widget.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/typeparameters/Widget.java rename to hibernate-core/src/test/java/org/hibernate/test/typeparameters/Widget.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unconstrained/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/unconstrained/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unconstrained/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/unconstrained/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unconstrained/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/unconstrained/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unconstrained/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/unconstrained/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unconstrained/Person.java b/hibernate-core/src/test/java/org/hibernate/test/unconstrained/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unconstrained/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/unconstrained/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unconstrained/UnconstrainedTest.java b/hibernate-core/src/test/java/org/hibernate/test/unconstrained/UnconstrainedTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unconstrained/UnconstrainedTest.java rename to hibernate-core/src/test/java/org/hibernate/test/unconstrained/UnconstrainedTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unidir/BackrefTest.java b/hibernate-core/src/test/java/org/hibernate/test/unidir/BackrefTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unidir/BackrefTest.java rename to hibernate-core/src/test/java/org/hibernate/test/unidir/BackrefTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unidir/Child.java b/hibernate-core/src/test/java/org/hibernate/test/unidir/Child.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unidir/Child.java rename to hibernate-core/src/test/java/org/hibernate/test/unidir/Child.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unidir/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/unidir/Parent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unidir/Parent.java rename to hibernate-core/src/test/java/org/hibernate/test/unidir/Parent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unidir/ParentChild.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/unidir/ParentChild.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unidir/ParentChild.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/unidir/ParentChild.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/Alien.java b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass/Alien.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/Alien.java rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass/Alien.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/Being.java b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass/Being.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/Being.java rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass/Being.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/Beings.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass/Beings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/Beings.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass/Beings.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/Hive.java b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass/Hive.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/Hive.java rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass/Hive.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/Human.java b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass/Human.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/Human.java rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass/Human.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/Location.java b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass/Location.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/Location.java rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass/Location.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/Thing.java b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass/Thing.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/Thing.java rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass/Thing.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/UnionSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass/UnionSubclassTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/UnionSubclassTest.java rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass/UnionSubclassTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/alias/CarBuyer.java b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass/alias/CarBuyer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/alias/CarBuyer.java rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass/alias/CarBuyer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/alias/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass/alias/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/alias/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass/alias/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/alias/PersonID.java b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass/alias/PersonID.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/alias/PersonID.java rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass/alias/PersonID.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/alias/SellCarTest.java b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass/alias/SellCarTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/alias/SellCarTest.java rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass/alias/SellCarTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/alias/Seller.java b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass/alias/Seller.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/alias/Seller.java rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass/alias/Seller.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/alias/mapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass/alias/mapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/alias/mapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass/alias/mapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass2/Address.java b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass2/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass2/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass2/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass2/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass2/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass2/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass2/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass2/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass2/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass2/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass2/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass2/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass2/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass2/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass2/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass2/Person.java b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass2/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass2/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass2/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass2/UnionSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/test/unionsubclass2/UnionSubclassTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass2/UnionSubclassTest.java rename to hibernate-core/src/test/java/org/hibernate/test/unionsubclass2/UnionSubclassTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/version/Person.java b/hibernate-core/src/test/java/org/hibernate/test/version/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/version/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/version/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/version/PersonThing.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/version/PersonThing.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/version/PersonThing.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/version/PersonThing.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/version/Task.java b/hibernate-core/src/test/java/org/hibernate/test/version/Task.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/version/Task.java rename to hibernate-core/src/test/java/org/hibernate/test/version/Task.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/version/Thing.java b/hibernate-core/src/test/java/org/hibernate/test/version/Thing.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/version/Thing.java rename to hibernate-core/src/test/java/org/hibernate/test/version/Thing.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/version/VersionTest.java b/hibernate-core/src/test/java/org/hibernate/test/version/VersionTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/version/VersionTest.java rename to hibernate-core/src/test/java/org/hibernate/test/version/VersionTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/version/db/DbVersionTest.java b/hibernate-core/src/test/java/org/hibernate/test/version/db/DbVersionTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/version/db/DbVersionTest.java rename to hibernate-core/src/test/java/org/hibernate/test/version/db/DbVersionTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/version/db/Group.java b/hibernate-core/src/test/java/org/hibernate/test/version/db/Group.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/version/db/Group.java rename to hibernate-core/src/test/java/org/hibernate/test/version/db/Group.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/version/db/Permission.java b/hibernate-core/src/test/java/org/hibernate/test/version/db/Permission.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/version/db/Permission.java rename to hibernate-core/src/test/java/org/hibernate/test/version/db/Permission.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/version/db/User.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/version/db/User.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/version/db/User.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/version/db/User.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/version/db/User.java b/hibernate-core/src/test/java/org/hibernate/test/version/db/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/version/db/User.java rename to hibernate-core/src/test/java/org/hibernate/test/version/db/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/version/sybase/Group.java b/hibernate-core/src/test/java/org/hibernate/test/version/sybase/Group.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/version/sybase/Group.java rename to hibernate-core/src/test/java/org/hibernate/test/version/sybase/Group.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/version/sybase/Permission.java b/hibernate-core/src/test/java/org/hibernate/test/version/sybase/Permission.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/version/sybase/Permission.java rename to hibernate-core/src/test/java/org/hibernate/test/version/sybase/Permission.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/version/sybase/SybaseTimestampVersioningTest.java b/hibernate-core/src/test/java/org/hibernate/test/version/sybase/SybaseTimestampVersioningTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/version/sybase/SybaseTimestampVersioningTest.java rename to hibernate-core/src/test/java/org/hibernate/test/version/sybase/SybaseTimestampVersioningTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/version/sybase/User.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/version/sybase/User.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/version/sybase/User.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/version/sybase/User.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/version/sybase/User.java b/hibernate-core/src/test/java/org/hibernate/test/version/sybase/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/version/sybase/User.java rename to hibernate-core/src/test/java/org/hibernate/test/version/sybase/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/where/File.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/where/File.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/where/File.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/where/File.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/where/File.java b/hibernate-core/src/test/java/org/hibernate/test/where/File.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/where/File.java rename to hibernate-core/src/test/java/org/hibernate/test/where/File.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/where/WhereTest.java b/hibernate-core/src/test/java/org/hibernate/test/where/WhereTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/where/WhereTest.java rename to hibernate-core/src/test/java/org/hibernate/test/where/WhereTest.java