diff --git a/build.gradle b/build.gradle index 74662b284c4..ee325d76494 100644 --- a/build.gradle +++ b/build.gradle @@ -54,9 +54,9 @@ def publishedProjects = [ // datastore 'grails-datastore-async', 'grails-datastore-core', - 'grails-datastore-gorm', + 'grails-datamapping-core', 'grails-datamapping-async', - //'grails-datastore-gorm-rx', + //'grails-datamapping-rx', 'grails-datamapping-support', 'grails-datamapping-tck-tests', 'grails-datamapping-tck-base', diff --git a/gradle/documentation-config.gradle b/gradle/documentation-config.gradle index a4a3d372855..050feac634e 100644 --- a/gradle/documentation-config.gradle +++ b/gradle/documentation-config.gradle @@ -21,7 +21,7 @@ tasks.register('data-mapping-groovydoc', Groovydoc) { it.name in [ 'grails-datastore-async', 'grails-datastore-core', - 'grails-datastore-gorm', + 'grails-datamapping-core', 'grails-datamapping-async', 'grails-datamapping-support', 'grails-datamapping-validation', @@ -29,7 +29,7 @@ tasks.register('data-mapping-groovydoc', Groovydoc) { // These are test api docs that aren't typically included in the runtime classpath of applications. // for now include them in the groovy doc unless we want to call out that documentation separately later. - 'grails-datastore-gorm-test', + 'grails-datamapping-core-test', 'grails-testing-support-datamapping' ] } diff --git a/grails-data-hibernate5/core/build.gradle b/grails-data-hibernate5/core/build.gradle index 0e7cfa4400e..595529e909f 100644 --- a/grails-data-hibernate5/core/build.gradle +++ b/grails-data-hibernate5/core/build.gradle @@ -24,7 +24,7 @@ dependencies { api "org.slf4j:slf4j-api" api "org.apache.groovy:groovy" - api project(":grails-datastore-gorm") + api project(":grails-datamapping-core") api "org.springframework:spring-orm" api "org.hibernate:hibernate-core-jakarta:$hibernateVersion", { exclude group:'commons-logging', module:'commons-logging' diff --git a/grails-data-hibernate5/docs/build.gradle b/grails-data-hibernate5/docs/build.gradle index 5fd603ba85a..2c1de5b5019 100644 --- a/grails-data-hibernate5/docs/build.gradle +++ b/grails-data-hibernate5/docs/build.gradle @@ -9,7 +9,7 @@ version = projectVersion ext { isReleaseVersion = !projectVersion.endsWith('-SNAPSHOT') - coreProjects = ['grails-datastore-core', 'grails-datastore-gorm'] + coreProjects = ['grails-datastore-core', 'grails-datamapping-core'] } configurations { diff --git a/grails-data-mongodb/boot-plugin/build.gradle b/grails-data-mongodb/boot-plugin/build.gradle index 2e40fa17738..4d6b76648bd 100644 --- a/grails-data-mongodb/boot-plugin/build.gradle +++ b/grails-data-mongodb/boot-plugin/build.gradle @@ -55,11 +55,11 @@ dependencies { // impl: Needed for Java Spring Boot apps // comp: @CompileStatic(source) } - // Provided by grails-datastore-gorm + // Provided by grails-datamapping-core // implementation project(':grails-datastore-core'), { // // impl: Service // } - implementation project(':grails-datastore-gorm'), { + implementation project(':grails-datamapping-core'), { // impl: ConfigurableApplicationContextEventPublisher } implementation 'org.springframework:spring-core', { diff --git a/grails-data-mongodb/bson/build.gradle b/grails-data-mongodb/bson/build.gradle index 0a9e90d717f..35e38aa4906 100644 --- a/grails-data-mongodb/bson/build.gradle +++ b/grails-data-mongodb/bson/build.gradle @@ -49,10 +49,10 @@ dependencies { exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure' } } - api project(':grails-datastore-gorm'), { + api project(':grails-datamapping-core'), { // api: DetachedCriteria if (excludeUnusedTransDeps) { - // API dependencies in grails-datastore-gorm + // API dependencies in grails-datamapping-core exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' //exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' // Entity exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' diff --git a/grails-data-mongodb/core/build.gradle b/grails-data-mongodb/core/build.gradle index a68ca9219e1..8b3f3156ff5 100644 --- a/grails-data-mongodb/core/build.gradle +++ b/grails-data-mongodb/core/build.gradle @@ -29,7 +29,7 @@ dependencies { // API dependencies in grails-data-mongodb-bson exclude group: 'org.mongodb', module: 'bson' exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' - exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm' + exclude group: 'org.apache.grails.data', module: 'grails-datamapping-core' } } api project(':grails-datastore-core'), { @@ -53,7 +53,7 @@ dependencies { exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure' } } - api project(':grails-datastore-gorm'), { + api project(':grails-datamapping-core'), { // api: CriteriaBuilder, AbstractResultList if (excludeUnusedTransDeps) { // API dependencies in grails-datastore-gorm @@ -73,7 +73,7 @@ dependencies { // API dependencies in grails-datamapping-support exclude group: 'org.apache.grails', module: 'grails-core' exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' - exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm' + exclude group: 'org.apache.grails.data', module: 'grails-datamapping-core' exclude group: 'org.springframework', module: 'spring-context' exclude group: 'org.springframework', module: 'spring-core' } diff --git a/grails-data-mongodb/docs/build.gradle b/grails-data-mongodb/docs/build.gradle index c88816f460f..e86cd8705ce 100644 --- a/grails-data-mongodb/docs/build.gradle +++ b/grails-data-mongodb/docs/build.gradle @@ -9,7 +9,7 @@ version = projectVersion ext { isReleaseVersion = !version.endsWith('SNAPSHOT') - coreProjects = ['grails-datastore-core', 'grails-datastore-gorm'] + coreProjects = ['grails-datastore-core', 'grails-datamapping-core'] } configurations { diff --git a/grails-data-mongodb/ext/build.gradle b/grails-data-mongodb/ext/build.gradle index 4d8d4c5de94..37384c299cf 100644 --- a/grails-data-mongodb/ext/build.gradle +++ b/grails-data-mongodb/ext/build.gradle @@ -37,7 +37,7 @@ dependencies { if (excludeUnusedTransDeps) { // API dependencies in grails-datastore-gorm-mongodb //exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' // NativeEntryEntityPersister - exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm' + exclude group: 'org.apache.grails.data', module: 'grails-datamapping-core' exclude group: 'org.apache.grails.data', module: 'grails-data-mongodb-bson' exclude group: 'org.apache.grails.data', module: 'grails-datamapping-support' //exclude group: 'org.mongodb', module: 'bson' // Document @@ -46,10 +46,10 @@ dependencies { exclude group: 'org.springframework', module: 'spring-context' } } - implementation project(':grails-datastore-gorm'), { + implementation project(':grails-datamapping-core'), { // impl: GormEnhancer if (excludeUnusedTransDeps) { - // API dependencies in grails-datastore-gorm + // API dependencies in grails-datamapping-core exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' //exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' // Entity exclude group: 'org.apache.grails', module: 'grails-core' diff --git a/grails-data-mongodb/grails-plugin/build.gradle b/grails-data-mongodb/grails-plugin/build.gradle index 0ea2b14eebc..b24935a483d 100644 --- a/grails-data-mongodb/grails-plugin/build.gradle +++ b/grails-data-mongodb/grails-plugin/build.gradle @@ -30,10 +30,10 @@ dependencies { // api: needed as classes should also be available when compiling apps. eg. MongoEntity // impl: MongoDatastore, MongoDbDataStoreSpringInitializer if (excludeUnusedTransDeps) { - // API dependencies in grails-datastore-gorm-mongodb + // API dependencies in grails-data-mongodb //exclude group: 'org.apache.grails.data', module: 'grails-data-mongodb-bson' // Needed at runtime downstream (BsonPersistentEntityCodec) exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' - exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm' + exclude group: 'org.apache.grails.data', module: 'grails-datamapping-core' exclude group: 'org.apache.grails.data', module: 'grails-datamapping-support' //exclude group: 'org.mongodb', module: 'bson' // Needed downstream for compiling MongoEntity //exclude group: 'org.mongodb', module: 'mongodb-driver-core' // MongoClientSettings @@ -47,7 +47,7 @@ dependencies { if (excludeUnusedTransDeps) { // API dependencies in grails-datamapping-support exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' - //exclude group: 'org.apache.grails.data, module: 'grails-datastore-gorm' // AbstractDatastorePersistenceContextInterceptor + //exclude group: 'org.apache.grails.data, module: 'grails-datamapping-core' // AbstractDatastorePersistenceContextInterceptor exclude group: 'org.apache.grails', module: 'grails-core' exclude group: 'org.springframework', module: 'spring-context' exclude group: 'org.springframework', module: 'spring-core' diff --git a/grails-data-neo4j/build.gradle b/grails-data-neo4j/build.gradle index ec500424d91..5ad59289440 100644 --- a/grails-data-neo4j/build.gradle +++ b/grails-data-neo4j/build.gradle @@ -217,14 +217,14 @@ subprojects { subproject -> if (details.requested.group == 'org.grails' && details.requested.name in ['grails-datastore-core', 'grails-datastore-async', - 'grails-datastore-gorm', + 'grails-datamapping-core', 'grails-datamapping-async', - 'grails-datastore-gorm-rx', + 'grails-datamapping-rx', 'grails-datamapping-support', 'grails-datamapping-tck-tests', 'grails-datamapping-tck-base', 'grails-datamapping-tck-domains', - 'grails-datastore-gorm-test', + 'grails-datamapping-core-test', 'grails-datamapping-validation', 'grails-datastore-web'] ) { diff --git a/grails-data-neo4j/grails-datastore-gorm-neo4j/build.gradle b/grails-data-neo4j/grails-datastore-gorm-neo4j/build.gradle index 7ad1a15c3fa..2cabe863b59 100644 --- a/grails-data-neo4j/grails-datastore-gorm-neo4j/build.gradle +++ b/grails-data-neo4j/grails-datastore-gorm-neo4j/build.gradle @@ -12,7 +12,7 @@ dependencies { implementation "org.javassist:javassist:$javassistVersion" testImplementation "org.neo4j.test:neo4j-harness:$neo4jVersion" - testImplementation "org.apache.grails.data:grails-datastore-gorm-test:$datastoreVersion" + testImplementation "org.apache.grails.data:grails-datamapping-core-test:$datastoreVersion" testImplementation "org.apache.grails.data:grails-datamapping-tck-tests:$datastoreVersion" testImplementation "org.hibernate:hibernate-validator:$hibernateValidatorVersion" testImplementation "org.codehaus.gpars:gpars:$gparsVersion" diff --git a/grails-data-simple/build.gradle b/grails-data-simple/build.gradle index 736a6eff466..71eacb6e099 100644 --- a/grails-data-simple/build.gradle +++ b/grails-data-simple/build.gradle @@ -27,11 +27,11 @@ dependencies { exclude group: 'org.springframework', module: 'spring-tx' } } - api project(':grails-datastore-gorm'), { + api project(':grails-datamapping-core'), { // api: ConfigurableApplicationEventPublisher, GormEnhancer, GormInstanceApi, GormStaticApi, GormValidationApi // impl: MultiTenantEventListener, ClasspathEntityScanner if (excludeUnusedTransDeps) { - // API dependencies in grails-datastore-gorm + // API dependencies in grails-datamapping-core //exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' // PostConstruct exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' diff --git a/grails-datamapping-async/build.gradle b/grails-datamapping-async/build.gradle index 61e5f922fa9..09db37ad672 100644 --- a/grails-datamapping-async/build.gradle +++ b/grails-datamapping-async/build.gradle @@ -10,11 +10,11 @@ dependencies { implementation platform("org.apache.grails:grails-bom:$grailsVersion") - api project(':grails-datastore-gorm'), { + api project(':grails-datamapping-core'), { // api: GormEntity, GormStaticApi, GormOperations, GormStaticOperations // impl: GormEnhancer if (excludeUnusedTransDeps) { - // API dependencies in grails-datastore-gorm + // API dependencies in grails-datamapping-core exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' //exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' // Entity //exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' // DirtyCheckable diff --git a/grails-datastore-gorm-test/build.gradle b/grails-datamapping-core-test/build.gradle similarity index 98% rename from grails-datastore-gorm-test/build.gradle rename to grails-datamapping-core-test/build.gradle index 37290469dac..ae02518e675 100644 --- a/grails-datastore-gorm-test/build.gradle +++ b/grails-datamapping-core-test/build.gradle @@ -32,7 +32,7 @@ dependencies { exclude group: 'org.springframework', module: 'spring-tx' } } - api project(':grails-datastore-gorm'), { + api project(':grails-datamapping-core'), { // api: ConfigurableApplicationEventPublisher, GormEnhancer, GormInstanceApi, GormStaticApi, GormValidationApi // impl: MultiTenantEventListener, ClasspathEntityScanner if (excludeUnusedTransDeps) { @@ -91,7 +91,7 @@ dependencies { testImplementation 'org.spockframework:spock-core' // Commented out since we aren't building / publishing - //testImplementation project(":grails-datastore-gorm-rx") + //testImplementation project(":grails-datamapping-rx") // Use the simple datastore to ensure the base implementation works correctly api project(':grails-data-simple') diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/services/RxServiceImplSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/services/RxServiceImplSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/services/RxServiceImplSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/services/RxServiceImplSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/services/ServiceImplSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/services/ServiceImplSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/services/ServiceImplSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/services/ServiceImplSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/services/multitenancy/database/Book.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/services/multitenancy/database/Book.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/services/multitenancy/database/Book.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/services/multitenancy/database/Book.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/services/multitenancy/database/BookService.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/services/multitenancy/database/BookService.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/services/multitenancy/database/BookService.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/services/multitenancy/database/BookService.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/services/multitenancy/database/DatabasePerTenantSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/services/multitenancy/database/DatabasePerTenantSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/services/multitenancy/database/DatabasePerTenantSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/services/multitenancy/database/DatabasePerTenantSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/services/multitenancy/database/IBookService.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/services/multitenancy/database/IBookService.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/services/multitenancy/database/IBookService.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/services/multitenancy/database/IBookService.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/services/multitenancy/partitioned/MultiTenantServiceTransformSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/services/multitenancy/partitioned/MultiTenantServiceTransformSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/services/multitenancy/partitioned/MultiTenantServiceTransformSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/services/multitenancy/partitioned/MultiTenantServiceTransformSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/services/multitenancy/partitioned/PartitionMultiTenancySpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/services/multitenancy/partitioned/PartitionMultiTenancySpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/services/multitenancy/partitioned/PartitionMultiTenancySpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/services/multitenancy/partitioned/PartitionMultiTenancySpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/services/multitenancy/schema/SchemaPerTenantSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/services/multitenancy/schema/SchemaPerTenantSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/services/multitenancy/schema/SchemaPerTenantSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/services/multitenancy/schema/SchemaPerTenantSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/AbstractNonGormParentClassSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/AbstractNonGormParentClassSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/AbstractNonGormParentClassSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/AbstractNonGormParentClassSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/CircularCascadeSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/CircularCascadeSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/CircularCascadeSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/CircularCascadeSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/CurrentTenantTransformSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/CurrentTenantTransformSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/CurrentTenantTransformSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/CurrentTenantTransformSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/DeepValidateWithSaveSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/DeepValidateWithSaveSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/DeepValidateWithSaveSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/DeepValidateWithSaveSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/DetachedCriteriaAssociationQuerySpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/DetachedCriteriaAssociationQuerySpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/DetachedCriteriaAssociationQuerySpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/DetachedCriteriaAssociationQuerySpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/JpaQueryBuilderSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/JpaQueryBuilderSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/JpaQueryBuilderSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/JpaQueryBuilderSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/MultipleDataSourceSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/MultipleDataSourceSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/MultipleDataSourceSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/MultipleDataSourceSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/OptimisticLockingSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/OptimisticLockingSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/OptimisticLockingSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/OptimisticLockingSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/ReadOnlyCriteriaSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/ReadOnlyCriteriaSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/ReadOnlyCriteriaSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/ReadOnlyCriteriaSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/SingleCharPropertySpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/SingleCharPropertySpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/SingleCharPropertySpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/SingleCharPropertySpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/SingleResultSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/SingleResultSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/SingleResultSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/SingleResultSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/SubquerySpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/SubquerySpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/SubquerySpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/SubquerySpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/TenantServiceSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/TenantServiceSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/TenantServiceSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/TenantServiceSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/TransactionServiceSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/TransactionServiceSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/TransactionServiceSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/TransactionServiceSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/TransactionalTransformOnServiceSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/TransactionalTransformOnServiceSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/TransactionalTransformOnServiceSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/TransactionalTransformOnServiceSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/WhereMethodEmbeddedInAssociationSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/WhereMethodEmbeddedInAssociationSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/WhereMethodEmbeddedInAssociationSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/WhereMethodEmbeddedInAssociationSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/WhereMethodSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/WhereMethodSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/WhereMethodSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/WhereMethodSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/validation/ArrayMaxSizeSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/validation/ArrayMaxSizeSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/grails/gorm/tests/validation/ArrayMaxSizeSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/validation/ArrayMaxSizeSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/AddToAndInjectedServiceSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/AddToAndInjectedServiceSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/AddToAndInjectedServiceSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/AddToAndInjectedServiceSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/AddToMethodWithBasicCollectionSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/AddToMethodWithBasicCollectionSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/AddToMethodWithBasicCollectionSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/AddToMethodWithBasicCollectionSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/AddToMethodWithEmbeddedCollectionSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/AddToMethodWithEmbeddedCollectionSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/AddToMethodWithEmbeddedCollectionSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/AddToMethodWithEmbeddedCollectionSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/AssignedIdentifierSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/AssignedIdentifierSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/AssignedIdentifierSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/AssignedIdentifierSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/AsyncReadMethodsSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/AsyncReadMethodsSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/AsyncReadMethodsSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/AsyncReadMethodsSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/AutoLinkOneToManyAssociationSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/AutoLinkOneToManyAssociationSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/AutoLinkOneToManyAssociationSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/AutoLinkOneToManyAssociationSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/BasicTypeHasManySpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/BasicTypeHasManySpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/BasicTypeHasManySpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/BasicTypeHasManySpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/BeforeUpdateEventSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/BeforeUpdateEventSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/BeforeUpdateEventSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/BeforeUpdateEventSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/BidirectionalOneToManyWithInheritanceSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/BidirectionalOneToManyWithInheritanceSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/BidirectionalOneToManyWithInheritanceSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/BidirectionalOneToManyWithInheritanceSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CacheAndJoinSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CacheAndJoinSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CacheAndJoinSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CacheAndJoinSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CircularManyToManySpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CircularManyToManySpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CircularManyToManySpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CircularManyToManySpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CircularManyToOneSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CircularManyToOneSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CircularManyToOneSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CircularManyToOneSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CircularOneToManySpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CircularOneToManySpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CircularOneToManySpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CircularOneToManySpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CompositeIdentifierSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CompositeIdentifierSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CompositeIdentifierSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CompositeIdentifierSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CriteriaProjectedResultsSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CriteriaProjectedResultsSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CriteriaProjectedResultsSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CriteriaProjectedResultsSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CustomAutoTimestampSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CustomAutoTimestampSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CustomAutoTimestampSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CustomAutoTimestampSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CustomSequenceIdentifierSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CustomSequenceIdentifierSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CustomSequenceIdentifierSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CustomSequenceIdentifierSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CustomStringIdentifierSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CustomStringIdentifierSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CustomStringIdentifierSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CustomStringIdentifierSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CustomTypeMarshallingSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CustomTypeMarshallingSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/CustomTypeMarshallingSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/CustomTypeMarshallingSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/DeindexingSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/DeindexingSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/DeindexingSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/DeindexingSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/DetachedCriteriaJpaEntitySpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/DetachedCriteriaJpaEntitySpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/DetachedCriteriaJpaEntitySpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/DetachedCriteriaJpaEntitySpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/DirtyCheckingSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/DirtyCheckingSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/DirtyCheckingSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/DirtyCheckingSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/DistinctProjectionSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/DistinctProjectionSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/DistinctProjectionSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/DistinctProjectionSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/DomainWithPrimitiveGetterSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/DomainWithPrimitiveGetterSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/DomainWithPrimitiveGetterSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/DomainWithPrimitiveGetterSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/DynamicFinderHungarianNotationSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/DynamicFinderHungarianNotationSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/DynamicFinderHungarianNotationSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/DynamicFinderHungarianNotationSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/EmbeddedAssociationSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/EmbeddedAssociationSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/EmbeddedAssociationSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/EmbeddedAssociationSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/EmbeddedAssociationWithNoEntityAndGlobalNullableConstraintSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/EmbeddedAssociationWithNoEntityAndGlobalNullableConstraintSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/EmbeddedAssociationWithNoEntityAndGlobalNullableConstraintSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/EmbeddedAssociationWithNoEntityAndGlobalNullableConstraintSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/EmbeddedNonEntityAssociationSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/EmbeddedNonEntityAssociationSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/EmbeddedNonEntityAssociationSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/EmbeddedNonEntityAssociationSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/EmbeddedPropertyQuerySpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/EmbeddedPropertyQuerySpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/EmbeddedPropertyQuerySpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/EmbeddedPropertyQuerySpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/EnumHasManySpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/EnumHasManySpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/EnumHasManySpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/EnumHasManySpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/FindByDomainInListSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/FindByDomainInListSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/FindByDomainInListSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/FindByDomainInListSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/GormDirtyCheckingSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/GormDirtyCheckingSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/GormDirtyCheckingSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/GormDirtyCheckingSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/HasManyDefaultMappedBySpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/HasManyDefaultMappedBySpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/HasManyDefaultMappedBySpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/HasManyDefaultMappedBySpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/HasOneSetInverseSideSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/HasOneSetInverseSideSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/HasOneSetInverseSideSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/HasOneSetInverseSideSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/InOperatorWithAssociationsSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/InOperatorWithAssociationsSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/InOperatorWithAssociationsSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/InOperatorWithAssociationsSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/InheritanceWithOneToManySpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/InheritanceWithOneToManySpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/InheritanceWithOneToManySpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/InheritanceWithOneToManySpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/ListOrderByHungarianNotationSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/ListOrderByHungarianNotationSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/ListOrderByHungarianNotationSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/ListOrderByHungarianNotationSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/ManyToManySpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/ManyToManySpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/ManyToManySpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/ManyToManySpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/MappedByNoneSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/MappedByNoneSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/MappedByNoneSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/MappedByNoneSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/NestedAssociationQuerySpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/NestedAssociationQuerySpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/NestedAssociationQuerySpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/NestedAssociationQuerySpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/NestedCriteriaWithNamedQuerySpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/NestedCriteriaWithNamedQuerySpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/NestedCriteriaWithNamedQuerySpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/NestedCriteriaWithNamedQuerySpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/NotLikeSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/NotLikeSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/NotLikeSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/NotLikeSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/NotNullQuerySpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/NotNullQuerySpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/NotNullQuerySpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/NotNullQuerySpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/OneToOneWithProxiesSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/OneToOneWithProxiesSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/OneToOneWithProxiesSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/OneToOneWithProxiesSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/OrderBySpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/OrderBySpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/OrderBySpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/OrderBySpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/QueryAssociationSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/QueryAssociationSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/QueryAssociationSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/QueryAssociationSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/QueryNonIndexedPropertySpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/QueryNonIndexedPropertySpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/QueryNonIndexedPropertySpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/QueryNonIndexedPropertySpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/ReadOnlyCriteriaResultsSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/ReadOnlyCriteriaResultsSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/ReadOnlyCriteriaResultsSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/ReadOnlyCriteriaResultsSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/SaveWithFailOnErrorDefaultSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/SaveWithFailOnErrorDefaultSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/SaveWithFailOnErrorDefaultSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/SaveWithFailOnErrorDefaultSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/Setup.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/Setup.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/Setup.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/Setup.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/TckTestSuite.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/TckTestSuite.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/TckTestSuite.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/TckTestSuite.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/UUIDTypeIdentifierSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/UUIDTypeIdentifierSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/UUIDTypeIdentifierSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/UUIDTypeIdentifierSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/UUIIdentifierSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/UUIIdentifierSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/UUIIdentifierSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/UUIIdentifierSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/schemaless/ImplementsDynamicAttributes.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/schemaless/ImplementsDynamicAttributes.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/schemaless/ImplementsDynamicAttributes.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/schemaless/ImplementsDynamicAttributes.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/validation/UniqueConstraintSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/validation/UniqueConstraintSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/validation/UniqueConstraintSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/validation/UniqueConstraintSpec.groovy diff --git a/grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/mapping/EntityReflectorSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/mapping/EntityReflectorSpec.groovy similarity index 100% rename from grails-datastore-gorm-test/src/test/groovy/org/grails/datastore/mapping/EntityReflectorSpec.groovy rename to grails-datamapping-core-test/src/test/groovy/org/grails/datastore/mapping/EntityReflectorSpec.groovy diff --git a/grails-datastore-gorm/build.gradle b/grails-datamapping-core/build.gradle similarity index 100% rename from grails-datastore-gorm/build.gradle rename to grails-datamapping-core/build.gradle diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/CriteriaBuilder.java b/grails-datamapping-core/src/main/groovy/grails/gorm/CriteriaBuilder.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/CriteriaBuilder.java rename to grails-datamapping-core/src/main/groovy/grails/gorm/CriteriaBuilder.java diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/DetachedCriteria.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/DetachedCriteria.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/DetachedCriteria.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/DetachedCriteria.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/Entity.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/Entity.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/Entity.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/Entity.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/MultiTenant.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/MultiTenant.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/MultiTenant.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/MultiTenant.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/PagedResultList.java b/grails-datamapping-core/src/main/groovy/grails/gorm/PagedResultList.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/PagedResultList.java rename to grails-datamapping-core/src/main/groovy/grails/gorm/PagedResultList.java diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/annotation/AutoTimestamp.java b/grails-datamapping-core/src/main/groovy/grails/gorm/annotation/AutoTimestamp.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/annotation/AutoTimestamp.java rename to grails-datamapping-core/src/main/groovy/grails/gorm/annotation/AutoTimestamp.java diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/annotation/Entity.java b/grails-datamapping-core/src/main/groovy/grails/gorm/annotation/Entity.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/annotation/Entity.java rename to grails-datamapping-core/src/main/groovy/grails/gorm/annotation/Entity.java diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/annotation/JpaEntity.java b/grails-datamapping-core/src/main/groovy/grails/gorm/annotation/JpaEntity.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/annotation/JpaEntity.java rename to grails-datamapping-core/src/main/groovy/grails/gorm/annotation/JpaEntity.java diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/api/GormAllOperations.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/api/GormAllOperations.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/api/GormAllOperations.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/api/GormAllOperations.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/api/GormInstanceOperations.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/api/GormInstanceOperations.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/api/GormInstanceOperations.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/api/GormInstanceOperations.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/api/GormStaticOperations.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/api/GormStaticOperations.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/api/GormStaticOperations.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/api/GormStaticOperations.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/dirty/checking/DirtyCheck.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/dirty/checking/DirtyCheck.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/dirty/checking/DirtyCheck.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/dirty/checking/DirtyCheck.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/dirty/checking/DirtyCheckedProperty.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/dirty/checking/DirtyCheckedProperty.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/dirty/checking/DirtyCheckedProperty.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/dirty/checking/DirtyCheckedProperty.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/multitenancy/CurrentTenant.java b/grails-datamapping-core/src/main/groovy/grails/gorm/multitenancy/CurrentTenant.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/multitenancy/CurrentTenant.java rename to grails-datamapping-core/src/main/groovy/grails/gorm/multitenancy/CurrentTenant.java diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/multitenancy/Tenant.java b/grails-datamapping-core/src/main/groovy/grails/gorm/multitenancy/Tenant.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/multitenancy/Tenant.java rename to grails-datamapping-core/src/main/groovy/grails/gorm/multitenancy/Tenant.java diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/multitenancy/TenantService.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/multitenancy/TenantService.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/multitenancy/TenantService.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/multitenancy/TenantService.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/multitenancy/Tenants.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/multitenancy/Tenants.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/multitenancy/Tenants.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/multitenancy/Tenants.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/multitenancy/WithoutTenant.java b/grails-datamapping-core/src/main/groovy/grails/gorm/multitenancy/WithoutTenant.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/multitenancy/WithoutTenant.java rename to grails-datamapping-core/src/main/groovy/grails/gorm/multitenancy/WithoutTenant.java diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/services/Join.java b/grails-datamapping-core/src/main/groovy/grails/gorm/services/Join.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/services/Join.java rename to grails-datamapping-core/src/main/groovy/grails/gorm/services/Join.java diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/services/Query.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/services/Query.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/services/Query.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/services/Query.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/services/Service.java b/grails-datamapping-core/src/main/groovy/grails/gorm/services/Service.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/services/Service.java rename to grails-datamapping-core/src/main/groovy/grails/gorm/services/Service.java diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/services/Where.java b/grails-datamapping-core/src/main/groovy/grails/gorm/services/Where.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/services/Where.java rename to grails-datamapping-core/src/main/groovy/grails/gorm/services/Where.java diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/time/InstantConverter.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/time/InstantConverter.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/time/InstantConverter.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/time/InstantConverter.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/time/LocalDateConverter.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/time/LocalDateConverter.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/time/LocalDateConverter.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/time/LocalDateConverter.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/time/LocalDateTimeConverter.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/time/LocalDateTimeConverter.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/time/LocalDateTimeConverter.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/time/LocalDateTimeConverter.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/time/LocalTimeConverter.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/time/LocalTimeConverter.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/time/LocalTimeConverter.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/time/LocalTimeConverter.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/time/OffsetDateTimeConverter.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/time/OffsetDateTimeConverter.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/time/OffsetDateTimeConverter.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/time/OffsetDateTimeConverter.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/time/OffsetTimeConverter.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/time/OffsetTimeConverter.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/time/OffsetTimeConverter.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/time/OffsetTimeConverter.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/time/PeriodConverter.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/time/PeriodConverter.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/time/PeriodConverter.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/time/PeriodConverter.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/time/TemporalConverter.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/time/TemporalConverter.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/time/TemporalConverter.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/time/TemporalConverter.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/time/ZonedDateTimeConverter.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/time/ZonedDateTimeConverter.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/time/ZonedDateTimeConverter.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/time/ZonedDateTimeConverter.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/transactions/GrailsTransactionAttribute.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/transactions/GrailsTransactionAttribute.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/transactions/GrailsTransactionAttribute.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/transactions/GrailsTransactionAttribute.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/transactions/GrailsTransactionTemplate.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/transactions/GrailsTransactionTemplate.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/transactions/GrailsTransactionTemplate.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/transactions/GrailsTransactionTemplate.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/transactions/NotTransactional.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/transactions/NotTransactional.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/transactions/NotTransactional.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/transactions/NotTransactional.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/transactions/ReadOnly.java b/grails-datamapping-core/src/main/groovy/grails/gorm/transactions/ReadOnly.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/transactions/ReadOnly.java rename to grails-datamapping-core/src/main/groovy/grails/gorm/transactions/ReadOnly.java diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/transactions/Rollback.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/transactions/Rollback.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/transactions/Rollback.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/transactions/Rollback.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/transactions/TransactionService.groovy b/grails-datamapping-core/src/main/groovy/grails/gorm/transactions/TransactionService.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/transactions/TransactionService.groovy rename to grails-datamapping-core/src/main/groovy/grails/gorm/transactions/TransactionService.groovy diff --git a/grails-datastore-gorm/src/main/groovy/grails/gorm/transactions/Transactional.java b/grails-datamapping-core/src/main/groovy/grails/gorm/transactions/Transactional.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/grails/gorm/transactions/Transactional.java rename to grails-datamapping-core/src/main/groovy/grails/gorm/transactions/Transactional.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/compiler/gorm/AdditionalGormEntityTransformation.groovy b/grails-datamapping-core/src/main/groovy/org/grails/compiler/gorm/AdditionalGormEntityTransformation.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/compiler/gorm/AdditionalGormEntityTransformation.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/compiler/gorm/AdditionalGormEntityTransformation.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/compiler/gorm/DirtyCheckTransformation.groovy b/grails-datamapping-core/src/main/groovy/org/grails/compiler/gorm/DirtyCheckTransformation.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/compiler/gorm/DirtyCheckTransformation.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/compiler/gorm/DirtyCheckTransformation.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/compiler/gorm/DirtyCheckingTransformer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/compiler/gorm/DirtyCheckingTransformer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/compiler/gorm/DirtyCheckingTransformer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/compiler/gorm/DirtyCheckingTransformer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/compiler/gorm/GlobalJpaEntityTransform.groovy b/grails-datamapping-core/src/main/groovy/org/grails/compiler/gorm/GlobalJpaEntityTransform.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/compiler/gorm/GlobalJpaEntityTransform.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/compiler/gorm/GlobalJpaEntityTransform.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/compiler/gorm/GormEntityTraitProvider.groovy b/grails-datamapping-core/src/main/groovy/org/grails/compiler/gorm/GormEntityTraitProvider.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/compiler/gorm/GormEntityTraitProvider.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/compiler/gorm/GormEntityTraitProvider.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/compiler/gorm/GormEntityTransformation.groovy b/grails-datamapping-core/src/main/groovy/org/grails/compiler/gorm/GormEntityTransformation.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/compiler/gorm/GormEntityTransformation.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/compiler/gorm/GormEntityTransformation.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/compiler/gorm/JpaGormEntityTransformation.groovy b/grails-datamapping-core/src/main/groovy/org/grails/compiler/gorm/JpaGormEntityTransformation.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/compiler/gorm/JpaGormEntityTransformation.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/compiler/gorm/JpaGormEntityTransformation.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/AbstractDatastoreApi.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/AbstractDatastoreApi.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/AbstractDatastoreApi.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/AbstractDatastoreApi.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/AbstractGormApi.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/AbstractGormApi.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/AbstractGormApi.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/AbstractGormApi.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/CurrentTenant.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/CurrentTenant.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/CurrentTenant.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/CurrentTenant.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/DelegatingGormEntityApi.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/DelegatingGormEntityApi.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/DelegatingGormEntityApi.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/DelegatingGormEntityApi.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormEnhancer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormEnhancer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormEnhancer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormEnhancer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormEntity.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormEntity.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormEntity.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormEntity.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormEntityApi.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormEntityApi.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormEntityApi.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormEntityApi.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormEntityDirtyCheckable.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormEntityDirtyCheckable.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormEntityDirtyCheckable.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormEntityDirtyCheckable.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormInstanceApi.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormInstanceApi.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormInstanceApi.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormInstanceApi.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormStaticApi.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormStaticApi.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormStaticApi.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormStaticApi.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormValidateable.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormValidateable.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormValidateable.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormValidateable.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormValidationApi.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormValidationApi.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/GormValidationApi.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormValidationApi.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/bootstrap/support/InstanceFactoryBean.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/bootstrap/support/InstanceFactoryBean.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/bootstrap/support/InstanceFactoryBean.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/bootstrap/support/InstanceFactoryBean.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/bootstrap/support/ServiceRegistryFactoryBean.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/bootstrap/support/ServiceRegistryFactoryBean.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/bootstrap/support/ServiceRegistryFactoryBean.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/bootstrap/support/ServiceRegistryFactoryBean.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/events/AutoTimestampEventListener.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/events/AutoTimestampEventListener.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/events/AutoTimestampEventListener.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/events/AutoTimestampEventListener.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/events/ConfigurableApplicationContextEventPublisher.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/events/ConfigurableApplicationContextEventPublisher.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/events/ConfigurableApplicationContextEventPublisher.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/events/ConfigurableApplicationContextEventPublisher.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/events/ConfigurableApplicationEventPublisher.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/events/ConfigurableApplicationEventPublisher.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/events/ConfigurableApplicationEventPublisher.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/events/ConfigurableApplicationEventPublisher.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/events/DefaultApplicationEventPublisher.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/events/DefaultApplicationEventPublisher.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/events/DefaultApplicationEventPublisher.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/events/DefaultApplicationEventPublisher.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/events/DomainEventListener.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/events/DomainEventListener.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/events/DomainEventListener.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/events/DomainEventListener.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/AbstractFindByFinder.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/AbstractFindByFinder.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/AbstractFindByFinder.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/AbstractFindByFinder.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/AbstractFinder.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/AbstractFinder.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/AbstractFinder.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/AbstractFinder.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/CountByFinder.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/CountByFinder.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/CountByFinder.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/CountByFinder.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/DynamicFinder.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/DynamicFinder.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/DynamicFinder.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/DynamicFinder.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/DynamicFinderInvocation.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/DynamicFinderInvocation.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/DynamicFinderInvocation.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/DynamicFinderInvocation.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FindAllByBooleanFinder.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/FindAllByBooleanFinder.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FindAllByBooleanFinder.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/FindAllByBooleanFinder.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FindAllByFinder.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/FindAllByFinder.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FindAllByFinder.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/FindAllByFinder.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FindByBooleanFinder.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/FindByBooleanFinder.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FindByBooleanFinder.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/FindByBooleanFinder.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FindByFinder.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/FindByFinder.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FindByFinder.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/FindByFinder.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FindOrCreateByFinder.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/FindOrCreateByFinder.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FindOrCreateByFinder.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/FindOrCreateByFinder.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FindOrSaveByFinder.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/FindOrSaveByFinder.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FindOrSaveByFinder.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/FindOrSaveByFinder.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FinderMethod.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/FinderMethod.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/FinderMethod.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/FinderMethod.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/ListOrderByFinder.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/ListOrderByFinder.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/ListOrderByFinder.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/ListOrderByFinder.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/MatchSpec.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/MatchSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/MatchSpec.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/MatchSpec.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/MethodExpression.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/MethodExpression.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/MethodExpression.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/MethodExpression.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/QueryBuildingFinder.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/QueryBuildingFinder.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/finders/QueryBuildingFinder.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/QueryBuildingFinder.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/internal/InstanceMethodInvokingClosure.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/internal/InstanceMethodInvokingClosure.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/internal/InstanceMethodInvokingClosure.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/internal/InstanceMethodInvokingClosure.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/internal/MethodInvokingClosure.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/internal/MethodInvokingClosure.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/internal/MethodInvokingClosure.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/internal/MethodInvokingClosure.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/internal/RuntimeSupport.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/internal/RuntimeSupport.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/internal/RuntimeSupport.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/internal/RuntimeSupport.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/internal/StaticMethodInvokingClosure.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/internal/StaticMethodInvokingClosure.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/internal/StaticMethodInvokingClosure.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/internal/StaticMethodInvokingClosure.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/DataSourceBuilder.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/DataSourceBuilder.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/DataSourceBuilder.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/DataSourceBuilder.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/DatabaseDriver.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/DatabaseDriver.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/DatabaseDriver.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/DatabaseDriver.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/MultiTenantConnection.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/MultiTenantConnection.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/MultiTenantConnection.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/MultiTenantConnection.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/MultiTenantDataSource.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/MultiTenantDataSource.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/MultiTenantDataSource.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/MultiTenantDataSource.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/OriginCapablePropertyValue.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/OriginCapablePropertyValue.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/OriginCapablePropertyValue.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/OriginCapablePropertyValue.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/PropertyOrigin.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/PropertyOrigin.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/PropertyOrigin.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/PropertyOrigin.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/RelaxedConversionService.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/RelaxedConversionService.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/RelaxedConversionService.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/RelaxedConversionService.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/RelaxedDataBinder.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/RelaxedDataBinder.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/RelaxedDataBinder.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/RelaxedDataBinder.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/RelaxedNames.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/RelaxedNames.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/RelaxedNames.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/RelaxedNames.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/CachedDataSourceConnectionSourceFactory.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/CachedDataSourceConnectionSourceFactory.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/CachedDataSourceConnectionSourceFactory.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/CachedDataSourceConnectionSourceFactory.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSource.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSource.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSource.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSource.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSourceFactory.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSourceFactory.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSourceFactory.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSourceFactory.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceSettings.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceSettings.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceSettings.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceSettings.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceSettingsBuilder.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceSettingsBuilder.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceSettingsBuilder.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceSettingsBuilder.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/SpringDataSourceConnectionSourceFactory.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/SpringDataSourceConnectionSourceFactory.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/SpringDataSourceConnectionSourceFactory.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/SpringDataSourceConnectionSourceFactory.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/schema/DefaultSchemaHandler.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/schema/DefaultSchemaHandler.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/schema/DefaultSchemaHandler.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/schema/DefaultSchemaHandler.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/schema/SchemaHandler.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/schema/SchemaHandler.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/schema/SchemaHandler.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/schema/SchemaHandler.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/multitenancy/MultiTenantEventListener.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/multitenancy/MultiTenantEventListener.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/multitenancy/MultiTenantEventListener.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/multitenancy/MultiTenantEventListener.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/multitenancy/TenantDelegatingGormOperations.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/multitenancy/TenantDelegatingGormOperations.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/multitenancy/TenantDelegatingGormOperations.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/multitenancy/TenantDelegatingGormOperations.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/multitenancy/transform/TenantTransform.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/multitenancy/transform/TenantTransform.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/multitenancy/transform/TenantTransform.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/multitenancy/transform/TenantTransform.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/plugin/support/PersistenceContextInterceptorAggregator.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/plugin/support/PersistenceContextInterceptorAggregator.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/plugin/support/PersistenceContextInterceptorAggregator.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/plugin/support/PersistenceContextInterceptorAggregator.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/proxy/GroovyProxyFactory.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/proxy/GroovyProxyFactory.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/proxy/GroovyProxyFactory.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/proxy/GroovyProxyFactory.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/proxy/ProxyInstanceMetaClass.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/proxy/ProxyInstanceMetaClass.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/proxy/ProxyInstanceMetaClass.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/proxy/ProxyInstanceMetaClass.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/AbstractResultList.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/AbstractResultList.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/AbstractResultList.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/AbstractResultList.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/GormOperations.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/GormOperations.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/GormOperations.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/GormOperations.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/GormQueryOperations.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/GormQueryOperations.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/GormQueryOperations.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/GormQueryOperations.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/NamedCriteriaProxy.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/NamedCriteriaProxy.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/NamedCriteriaProxy.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/NamedCriteriaProxy.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/NamedQueriesBuilder.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/NamedQueriesBuilder.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/NamedQueriesBuilder.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/NamedQueriesBuilder.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/criteria/AbstractCriteriaBuilder.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/criteria/AbstractCriteriaBuilder.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/criteria/AbstractCriteriaBuilder.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/criteria/AbstractCriteriaBuilder.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/criteria/AbstractDetachedCriteria.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/criteria/AbstractDetachedCriteria.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/criteria/AbstractDetachedCriteria.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/criteria/AbstractDetachedCriteria.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/criteria/DetachedAssociationCriteria.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/criteria/DetachedAssociationCriteria.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/criteria/DetachedAssociationCriteria.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/criteria/DetachedAssociationCriteria.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/transform/ApplyDetachedCriteriaTransform.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/transform/ApplyDetachedCriteriaTransform.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/transform/ApplyDetachedCriteriaTransform.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/transform/ApplyDetachedCriteriaTransform.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/transform/DetachedCriteriaASTTransformation.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/transform/DetachedCriteriaASTTransformation.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/transform/DetachedCriteriaASTTransformation.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/transform/DetachedCriteriaASTTransformation.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/transform/DetachedCriteriaTransformer.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/transform/DetachedCriteriaTransformer.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/transform/DetachedCriteriaTransformer.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/transform/DetachedCriteriaTransformer.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/transform/GlobalDetachedCriteriaASTTransformation.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/transform/GlobalDetachedCriteriaASTTransformation.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/query/transform/GlobalDetachedCriteriaASTTransformation.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/transform/GlobalDetachedCriteriaASTTransformation.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/schemaless/DynamicAttributeHelper.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/schemaless/DynamicAttributeHelper.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/schemaless/DynamicAttributeHelper.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/schemaless/DynamicAttributeHelper.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/schemaless/DynamicAttributes.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/schemaless/DynamicAttributes.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/schemaless/DynamicAttributes.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/schemaless/DynamicAttributes.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/DefaultTenantService.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/DefaultTenantService.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/DefaultTenantService.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/DefaultTenantService.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/DefaultTransactionService.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/DefaultTransactionService.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/DefaultTransactionService.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/DefaultTransactionService.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/Implemented.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/Implemented.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/Implemented.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/Implemented.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/ServiceEnhancer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/ServiceEnhancer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/ServiceEnhancer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/ServiceEnhancer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/ServiceImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/ServiceImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/ServiceImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/ServiceImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/ServiceImplementerAdapter.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/ServiceImplementerAdapter.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/ServiceImplementerAdapter.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/ServiceImplementerAdapter.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractArrayOrIterableResultImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractArrayOrIterableResultImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractArrayOrIterableResultImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractArrayOrIterableResultImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractDetachedCriteriaServiceImplementor.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractDetachedCriteriaServiceImplementor.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractDetachedCriteriaServiceImplementor.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractDetachedCriteriaServiceImplementor.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractProjectionImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractProjectionImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractProjectionImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractProjectionImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractReadOperationImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractReadOperationImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractReadOperationImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractReadOperationImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractSaveImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractSaveImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractSaveImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractSaveImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractServiceImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractServiceImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractServiceImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractServiceImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractStringQueryImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractStringQueryImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractStringQueryImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractStringQueryImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractWhereImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractWhereImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractWhereImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractWhereImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractWriteOperationImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractWriteOperationImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractWriteOperationImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AbstractWriteOperationImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AdaptedImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AdaptedImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AdaptedImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AdaptedImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AnnotatedServiceImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AnnotatedServiceImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/AnnotatedServiceImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/AnnotatedServiceImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/CountByImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/CountByImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/CountByImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/CountByImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/CountImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/CountImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/CountImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/CountImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/CountWhereImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/CountWhereImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/CountWhereImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/CountWhereImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/DeleteImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/DeleteImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/DeleteImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/DeleteImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/DeleteWhereImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/DeleteWhereImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/DeleteWhereImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/DeleteWhereImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllByImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllByImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllByImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllByImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllByInterfaceProjectionImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllByInterfaceProjectionImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllByInterfaceProjectionImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllByInterfaceProjectionImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllInterfaceProjectionImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllInterfaceProjectionImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllInterfaceProjectionImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllInterfaceProjectionImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllPropertyProjectionImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllPropertyProjectionImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllPropertyProjectionImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllPropertyProjectionImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllStringQueryImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllStringQueryImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllStringQueryImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllStringQueryImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllWhereImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllWhereImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllWhereImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAllWhereImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAndDeleteImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAndDeleteImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAndDeleteImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindAndDeleteImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneByImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneByImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneByImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneByImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneByInterfaceProjectionImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneByInterfaceProjectionImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneByInterfaceProjectionImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneByInterfaceProjectionImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneInterfaceProjectionImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneInterfaceProjectionImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneInterfaceProjectionImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneInterfaceProjectionImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneInterfaceProjectionStringQueryImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneInterfaceProjectionStringQueryImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneInterfaceProjectionStringQueryImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneInterfaceProjectionStringQueryImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneInterfaceProjectionWhereImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneInterfaceProjectionWhereImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneInterfaceProjectionWhereImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneInterfaceProjectionWhereImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOnePropertyProjectionImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOnePropertyProjectionImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOnePropertyProjectionImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOnePropertyProjectionImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneStringQueryImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneStringQueryImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneStringQueryImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneStringQueryImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneWhereImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneWhereImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneWhereImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/FindOneWhereImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/InterfaceProjectionBuilder.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/InterfaceProjectionBuilder.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/InterfaceProjectionBuilder.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/InterfaceProjectionBuilder.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/IterableInterfaceProjectionBuilder.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/IterableInterfaceProjectionBuilder.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/IterableInterfaceProjectionBuilder.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/IterableInterfaceProjectionBuilder.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/IterableProjectionServiceImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/IterableProjectionServiceImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/IterableProjectionServiceImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/IterableProjectionServiceImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/IterableServiceImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/IterableServiceImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/IterableServiceImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/IterableServiceImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/NoResultServiceImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/NoResultServiceImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/NoResultServiceImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/NoResultServiceImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/PrefixedServiceImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/PrefixedServiceImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/PrefixedServiceImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/PrefixedServiceImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/QueryStringImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/QueryStringImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/QueryStringImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/QueryStringImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/SaveImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/SaveImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/SaveImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/SaveImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/SingleResultInterfaceProjectionBuilder.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/SingleResultInterfaceProjectionBuilder.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/SingleResultInterfaceProjectionBuilder.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/SingleResultInterfaceProjectionBuilder.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/SingleResultProjectionServiceImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/SingleResultProjectionServiceImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/SingleResultProjectionServiceImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/SingleResultProjectionServiceImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/SingleResultServiceImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/SingleResultServiceImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/SingleResultServiceImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/SingleResultServiceImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/UpdateOneImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/UpdateOneImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/UpdateOneImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/UpdateOneImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/UpdateStringQueryImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/UpdateStringQueryImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/implementers/UpdateStringQueryImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/implementers/UpdateStringQueryImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/transform/QueryStringTransformer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/transform/QueryStringTransformer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/transform/QueryStringTransformer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/transform/QueryStringTransformer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/transform/ServiceTransformation.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/transform/ServiceTransformation.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/services/transform/ServiceTransformation.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/services/transform/ServiceTransformation.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/support/AbstractDatastorePersistenceContextInterceptor.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/support/AbstractDatastorePersistenceContextInterceptor.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/support/AbstractDatastorePersistenceContextInterceptor.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/support/AbstractDatastorePersistenceContextInterceptor.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/timestamp/AggregateTimestampProvider.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/timestamp/AggregateTimestampProvider.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/timestamp/AggregateTimestampProvider.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/timestamp/AggregateTimestampProvider.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/timestamp/DefaultTimestampProvider.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/timestamp/DefaultTimestampProvider.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/timestamp/DefaultTimestampProvider.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/timestamp/DefaultTimestampProvider.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/timestamp/TimestampProvider.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/timestamp/TimestampProvider.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/timestamp/TimestampProvider.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/timestamp/TimestampProvider.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transactions/transform/RollbackTransform.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/transactions/transform/RollbackTransform.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transactions/transform/RollbackTransform.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/transactions/transform/RollbackTransform.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transactions/transform/TransactionalTransform.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/transactions/transform/TransactionalTransform.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transactions/transform/TransactionalTransform.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/transactions/transform/TransactionalTransform.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transform/AbstractDatastoreMethodDecoratingTransformation.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/transform/AbstractDatastoreMethodDecoratingTransformation.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transform/AbstractDatastoreMethodDecoratingTransformation.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/transform/AbstractDatastoreMethodDecoratingTransformation.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transform/AbstractGormASTTransformation.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/transform/AbstractGormASTTransformation.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transform/AbstractGormASTTransformation.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/transform/AbstractGormASTTransformation.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transform/AbstractMethodDecoratingTransformation.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/transform/AbstractMethodDecoratingTransformation.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transform/AbstractMethodDecoratingTransformation.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/transform/AbstractMethodDecoratingTransformation.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transform/AbstractTraitApplyingGormASTTransformation.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/transform/AbstractTraitApplyingGormASTTransformation.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transform/AbstractTraitApplyingGormASTTransformation.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/transform/AbstractTraitApplyingGormASTTransformation.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transform/AstMethodDispatchUtils.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/transform/AstMethodDispatchUtils.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transform/AstMethodDispatchUtils.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/transform/AstMethodDispatchUtils.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transform/AstPropertyResolveUtils.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/transform/AstPropertyResolveUtils.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transform/AstPropertyResolveUtils.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/transform/AstPropertyResolveUtils.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transform/GormASTTransformationClass.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/transform/GormASTTransformationClass.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transform/GormASTTransformationClass.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/transform/GormASTTransformationClass.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transform/OrderedGormTransformation.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/transform/OrderedGormTransformation.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/transform/OrderedGormTransformation.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/transform/OrderedGormTransformation.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/AbstractRecursiveAnnotationVisitor.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/AbstractRecursiveAnnotationVisitor.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/AbstractRecursiveAnnotationVisitor.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/AbstractRecursiveAnnotationVisitor.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/AnnotationAttributesReadingVisitor.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/AnnotationAttributesReadingVisitor.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/AnnotationAttributesReadingVisitor.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/AnnotationAttributesReadingVisitor.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/AnnotationMetadataReader.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/AnnotationMetadataReader.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/AnnotationMetadataReader.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/AnnotationMetadataReader.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/AnnotationMetadataReaderFactory.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/AnnotationMetadataReaderFactory.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/AnnotationMetadataReaderFactory.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/AnnotationMetadataReaderFactory.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/AnnotationMetadataReadingVisitor.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/AnnotationMetadataReadingVisitor.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/AnnotationMetadataReadingVisitor.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/AnnotationMetadataReadingVisitor.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/AnnotationReadingVisitorUtils.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/AnnotationReadingVisitorUtils.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/AnnotationReadingVisitorUtils.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/AnnotationReadingVisitorUtils.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/Attribute.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/Attribute.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/Attribute.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/Attribute.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/ClassMetadataReadingVisitor.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/ClassMetadataReadingVisitor.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/ClassMetadataReadingVisitor.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/ClassMetadataReadingVisitor.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/ClassReader.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/ClassReader.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/ClassReader.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/ClassReader.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/ClasspathEntityScanner.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/ClasspathEntityScanner.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/ClasspathEntityScanner.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/ClasspathEntityScanner.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/Context.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/Context.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/Context.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/Context.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/FilteredAnnotationMetadata.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/FilteredAnnotationMetadata.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/FilteredAnnotationMetadata.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/FilteredAnnotationMetadata.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/InstanceProxy.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/InstanceProxy.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/InstanceProxy.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/InstanceProxy.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/MethodMetadataReadingVisitor.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/MethodMetadataReadingVisitor.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/MethodMetadataReadingVisitor.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/MethodMetadataReadingVisitor.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/RecursiveAnnotationArrayVisitor.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/RecursiveAnnotationArrayVisitor.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/RecursiveAnnotationArrayVisitor.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/RecursiveAnnotationArrayVisitor.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/RecursiveAnnotationAttributesVisitor.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/RecursiveAnnotationAttributesVisitor.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/RecursiveAnnotationAttributesVisitor.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/RecursiveAnnotationAttributesVisitor.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/ReflectionUtils.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/ReflectionUtils.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/utils/ReflectionUtils.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/utils/ReflectionUtils.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/CascadingValidator.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/CascadingValidator.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/CascadingValidator.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/CascadingValidator.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/ValidatorProvider.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/ValidatorProvider.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/ValidatorProvider.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/ValidatorProvider.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MappingContextAwareConstraintFactory.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MappingContextAwareConstraintFactory.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MappingContextAwareConstraintFactory.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MappingContextAwareConstraintFactory.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/constraints/builtin/UniqueConstraint.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/constraints/builtin/UniqueConstraint.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/constraints/builtin/UniqueConstraint.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/constraints/builtin/UniqueConstraint.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/ConfigurableParameterNameProvider.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/ConfigurableParameterNameProvider.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/ConfigurableParameterNameProvider.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/ConfigurableParameterNameProvider.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/ConstraintViolationUtils.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/ConstraintViolationUtils.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/ConstraintViolationUtils.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/ConstraintViolationUtils.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/GormValidatorAdapter.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/GormValidatorAdapter.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/GormValidatorAdapter.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/GormValidatorAdapter.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/GormValidatorFactoryAdapter.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/GormValidatorFactoryAdapter.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/GormValidatorFactoryAdapter.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/GormValidatorFactoryAdapter.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/JakartaValidatorRegistry.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/JakartaValidatorRegistry.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/JakartaValidatorRegistry.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/JakartaValidatorRegistry.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/MappingContextTraversableResolver.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/MappingContextTraversableResolver.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/MappingContextTraversableResolver.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/MappingContextTraversableResolver.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/MethodKey.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/MethodKey.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/MethodKey.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/MethodKey.java diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/services/ValidatedService.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/services/ValidatedService.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/services/ValidatedService.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/services/ValidatedService.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/services/implementers/MethodValidationImplementer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/services/implementers/MethodValidationImplementer.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/services/implementers/MethodValidationImplementer.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/jakarta/services/implementers/MethodValidationImplementer.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/listener/ValidationEventListener.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/listener/ValidationEventListener.groovy similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/listener/ValidationEventListener.groovy rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/listener/ValidationEventListener.groovy diff --git a/grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/registry/support/ValidatorRegistries.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/registry/support/ValidatorRegistries.java similarity index 100% rename from grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/registry/support/ValidatorRegistries.java rename to grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/registry/support/ValidatorRegistries.java diff --git a/grails-datastore-gorm/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation b/grails-datamapping-core/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation similarity index 100% rename from grails-datastore-gorm/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation rename to grails-datamapping-core/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation diff --git a/grails-datastore-gorm/src/main/resources/META-INF/services/org.grails.datastore.mapping.services.Service b/grails-datamapping-core/src/main/resources/META-INF/services/org.grails.datastore.mapping.services.Service similarity index 100% rename from grails-datastore-gorm/src/main/resources/META-INF/services/org.grails.datastore.mapping.services.Service rename to grails-datamapping-core/src/main/resources/META-INF/services/org.grails.datastore.mapping.services.Service diff --git a/grails-datastore-gorm/src/test/groovy/grails/gorm/annotation/multitenancy/CurrentTenantTransformSpec.groovy b/grails-datamapping-core/src/test/groovy/grails/gorm/annotation/multitenancy/CurrentTenantTransformSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/grails/gorm/annotation/multitenancy/CurrentTenantTransformSpec.groovy rename to grails-datamapping-core/src/test/groovy/grails/gorm/annotation/multitenancy/CurrentTenantTransformSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/grails/gorm/annotation/transactions/TransactionalTransformSpec.groovy b/grails-datamapping-core/src/test/groovy/grails/gorm/annotation/transactions/TransactionalTransformSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/grails/gorm/annotation/transactions/TransactionalTransformSpec.groovy rename to grails-datamapping-core/src/test/groovy/grails/gorm/annotation/transactions/TransactionalTransformSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/grails/gorm/services/MethodValidationTransformSpec.groovy b/grails-datamapping-core/src/test/groovy/grails/gorm/services/MethodValidationTransformSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/grails/gorm/services/MethodValidationTransformSpec.groovy rename to grails-datamapping-core/src/test/groovy/grails/gorm/services/MethodValidationTransformSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/grails/gorm/services/ServiceTransformSpec.groovy b/grails-datamapping-core/src/test/groovy/grails/gorm/services/ServiceTransformSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/grails/gorm/services/ServiceTransformSpec.groovy rename to grails-datamapping-core/src/test/groovy/grails/gorm/services/ServiceTransformSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/grails/gorm/time/InstantConverterSpec.groovy b/grails-datamapping-core/src/test/groovy/grails/gorm/time/InstantConverterSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/grails/gorm/time/InstantConverterSpec.groovy rename to grails-datamapping-core/src/test/groovy/grails/gorm/time/InstantConverterSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/grails/gorm/time/LocalDateConverterSpec.groovy b/grails-datamapping-core/src/test/groovy/grails/gorm/time/LocalDateConverterSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/grails/gorm/time/LocalDateConverterSpec.groovy rename to grails-datamapping-core/src/test/groovy/grails/gorm/time/LocalDateConverterSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/grails/gorm/time/LocalDateTimeConverterSpec.groovy b/grails-datamapping-core/src/test/groovy/grails/gorm/time/LocalDateTimeConverterSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/grails/gorm/time/LocalDateTimeConverterSpec.groovy rename to grails-datamapping-core/src/test/groovy/grails/gorm/time/LocalDateTimeConverterSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/grails/gorm/time/LocalTimeConverterSpec.groovy b/grails-datamapping-core/src/test/groovy/grails/gorm/time/LocalTimeConverterSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/grails/gorm/time/LocalTimeConverterSpec.groovy rename to grails-datamapping-core/src/test/groovy/grails/gorm/time/LocalTimeConverterSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/grails/gorm/time/OffsetDateTimeConverterSpec.groovy b/grails-datamapping-core/src/test/groovy/grails/gorm/time/OffsetDateTimeConverterSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/grails/gorm/time/OffsetDateTimeConverterSpec.groovy rename to grails-datamapping-core/src/test/groovy/grails/gorm/time/OffsetDateTimeConverterSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/grails/gorm/time/OffsetTimeConverterSpec.groovy b/grails-datamapping-core/src/test/groovy/grails/gorm/time/OffsetTimeConverterSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/grails/gorm/time/OffsetTimeConverterSpec.groovy rename to grails-datamapping-core/src/test/groovy/grails/gorm/time/OffsetTimeConverterSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/grails/gorm/time/PeriodConverterSpec.groovy b/grails-datamapping-core/src/test/groovy/grails/gorm/time/PeriodConverterSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/grails/gorm/time/PeriodConverterSpec.groovy rename to grails-datamapping-core/src/test/groovy/grails/gorm/time/PeriodConverterSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/grails/gorm/time/ZonedDateTimeConverterSpec.groovy b/grails-datamapping-core/src/test/groovy/grails/gorm/time/ZonedDateTimeConverterSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/grails/gorm/time/ZonedDateTimeConverterSpec.groovy rename to grails-datamapping-core/src/test/groovy/grails/gorm/time/ZonedDateTimeConverterSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/org/grails/compiler/gorm/EntityWithGenericSignaturesSpec.groovy b/grails-datamapping-core/src/test/groovy/org/grails/compiler/gorm/EntityWithGenericSignaturesSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/org/grails/compiler/gorm/EntityWithGenericSignaturesSpec.groovy rename to grails-datamapping-core/src/test/groovy/org/grails/compiler/gorm/EntityWithGenericSignaturesSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/org/grails/compiler/gorm/GormEntityTransformSpec.groovy b/grails-datamapping-core/src/test/groovy/org/grails/compiler/gorm/GormEntityTransformSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/org/grails/compiler/gorm/GormEntityTransformSpec.groovy rename to grails-datamapping-core/src/test/groovy/org/grails/compiler/gorm/GormEntityTransformSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/org/grails/compiler/gorm/JpaEntityTransformSpec.groovy b/grails-datamapping-core/src/test/groovy/org/grails/compiler/gorm/JpaEntityTransformSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/org/grails/compiler/gorm/JpaEntityTransformSpec.groovy rename to grails-datamapping-core/src/test/groovy/org/grails/compiler/gorm/JpaEntityTransformSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/BeforeValidateHelperSerializationSpec.groovy b/grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/BeforeValidateHelperSerializationSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/BeforeValidateHelperSerializationSpec.groovy rename to grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/BeforeValidateHelperSerializationSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/dirty/checking/DirtyCheckTransformationSpec.groovy b/grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/dirty/checking/DirtyCheckTransformationSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/dirty/checking/DirtyCheckTransformationSpec.groovy rename to grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/dirty/checking/DirtyCheckTransformationSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/finders/DynamicFinderSpec.groovy b/grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/finders/DynamicFinderSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/finders/DynamicFinderSpec.groovy rename to grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/finders/DynamicFinderSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/model/TransientInheritanceSpec.groovy b/grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/model/TransientInheritanceSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/model/TransientInheritanceSpec.groovy rename to grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/model/TransientInheritanceSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/services/transform/QueryStringTransformerSpec.groovy b/grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/services/transform/QueryStringTransformerSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/services/transform/QueryStringTransformerSpec.groovy rename to grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/services/transform/QueryStringTransformerSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/support/BeforeValidateHelperTests.groovy b/grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/support/BeforeValidateHelperTests.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/support/BeforeValidateHelperTests.groovy rename to grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/support/BeforeValidateHelperTests.groovy diff --git a/grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/timestamp/AutoTimestampEventListenerSpec.groovy b/grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/timestamp/AutoTimestampEventListenerSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/timestamp/AutoTimestampEventListenerSpec.groovy rename to grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/timestamp/AutoTimestampEventListenerSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/timestamp/DefaultTimestampProviderSpec.groovy b/grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/timestamp/DefaultTimestampProviderSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/timestamp/DefaultTimestampProviderSpec.groovy rename to grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/timestamp/DefaultTimestampProviderSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/utils/ClasspathEntityScannerSpec.groovy b/grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/utils/ClasspathEntityScannerSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/utils/ClasspathEntityScannerSpec.groovy rename to grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/utils/ClasspathEntityScannerSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/validation/jakarta/MappingContextTraversableResolverSpec.groovy b/grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/validation/jakarta/MappingContextTraversableResolverSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/validation/jakarta/MappingContextTraversableResolverSpec.groovy rename to grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/validation/jakarta/MappingContextTraversableResolverSpec.groovy diff --git a/grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/validation/support/GormValidatorAdapterSpec.groovy b/grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/validation/support/GormValidatorAdapterSpec.groovy similarity index 100% rename from grails-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/validation/support/GormValidatorAdapterSpec.groovy rename to grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/validation/support/GormValidatorAdapterSpec.groovy diff --git a/grails-datastore-gorm/src/test/resources/cassandra-conf/log4j.properties b/grails-datamapping-core/src/test/resources/cassandra-conf/log4j.properties similarity index 100% rename from grails-datastore-gorm/src/test/resources/cassandra-conf/log4j.properties rename to grails-datamapping-core/src/test/resources/cassandra-conf/log4j.properties diff --git a/grails-datastore-gorm/src/test/resources/cassandra-conf/storage-conf.xml b/grails-datamapping-core/src/test/resources/cassandra-conf/storage-conf.xml similarity index 100% rename from grails-datastore-gorm/src/test/resources/cassandra-conf/storage-conf.xml rename to grails-datamapping-core/src/test/resources/cassandra-conf/storage-conf.xml diff --git a/grails-datastore-gorm-rx/build.gradle b/grails-datamapping-rx/build.gradle similarity index 96% rename from grails-datastore-gorm-rx/build.gradle rename to grails-datamapping-rx/build.gradle index a66660a81b3..289a5b84a7f 100644 --- a/grails-datastore-gorm-rx/build.gradle +++ b/grails-datamapping-rx/build.gradle @@ -11,7 +11,7 @@ dependencies { implementation 'org.apache.groovy:groovy' api "io.reactivex:rxjava" - api project(":grails-datastore-gorm"), { + api project(":grails-datamapping-core"), { exclude group:"org.apache.grails.async", module:'grails-async' exclude group:"org.apache.grails.data", module:'grails-datastore-core' } diff --git a/grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/CriteriaBuilder.groovy b/grails-datamapping-rx/src/main/groovy/grails/gorm/rx/CriteriaBuilder.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/CriteriaBuilder.groovy rename to grails-datamapping-rx/src/main/groovy/grails/gorm/rx/CriteriaBuilder.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/DetachedCriteria.groovy b/grails-datamapping-rx/src/main/groovy/grails/gorm/rx/DetachedCriteria.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/DetachedCriteria.groovy rename to grails-datamapping-rx/src/main/groovy/grails/gorm/rx/DetachedCriteria.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/MultiTenant.groovy b/grails-datamapping-rx/src/main/groovy/grails/gorm/rx/MultiTenant.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/MultiTenant.groovy rename to grails-datamapping-rx/src/main/groovy/grails/gorm/rx/MultiTenant.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/PersistentObservable.java b/grails-datamapping-rx/src/main/groovy/grails/gorm/rx/PersistentObservable.java similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/PersistentObservable.java rename to grails-datamapping-rx/src/main/groovy/grails/gorm/rx/PersistentObservable.java diff --git a/grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/RxEntity.groovy b/grails-datamapping-rx/src/main/groovy/grails/gorm/rx/RxEntity.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/RxEntity.groovy rename to grails-datamapping-rx/src/main/groovy/grails/gorm/rx/RxEntity.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/api/RxGormAllOperations.groovy b/grails-datamapping-rx/src/main/groovy/grails/gorm/rx/api/RxGormAllOperations.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/api/RxGormAllOperations.groovy rename to grails-datamapping-rx/src/main/groovy/grails/gorm/rx/api/RxGormAllOperations.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/api/RxGormInstanceOperations.groovy b/grails-datamapping-rx/src/main/groovy/grails/gorm/rx/api/RxGormInstanceOperations.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/api/RxGormInstanceOperations.groovy rename to grails-datamapping-rx/src/main/groovy/grails/gorm/rx/api/RxGormInstanceOperations.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/api/RxGormOperations.groovy b/grails-datamapping-rx/src/main/groovy/grails/gorm/rx/api/RxGormOperations.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/api/RxGormOperations.groovy rename to grails-datamapping-rx/src/main/groovy/grails/gorm/rx/api/RxGormOperations.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/api/RxGormStaticOperations.groovy b/grails-datamapping-rx/src/main/groovy/grails/gorm/rx/api/RxGormStaticOperations.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/api/RxGormStaticOperations.groovy rename to grails-datamapping-rx/src/main/groovy/grails/gorm/rx/api/RxGormStaticOperations.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/collection/ObservableCollection.java b/grails-datamapping-rx/src/main/groovy/grails/gorm/rx/collection/ObservableCollection.java similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/collection/ObservableCollection.java rename to grails-datamapping-rx/src/main/groovy/grails/gorm/rx/collection/ObservableCollection.java diff --git a/grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/collection/RxPersistentCollection.java b/grails-datamapping-rx/src/main/groovy/grails/gorm/rx/collection/RxPersistentCollection.java similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/collection/RxPersistentCollection.java rename to grails-datamapping-rx/src/main/groovy/grails/gorm/rx/collection/RxPersistentCollection.java diff --git a/grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/collection/RxUnidirectionalCollection.java b/grails-datamapping-rx/src/main/groovy/grails/gorm/rx/collection/RxUnidirectionalCollection.java similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/collection/RxUnidirectionalCollection.java rename to grails-datamapping-rx/src/main/groovy/grails/gorm/rx/collection/RxUnidirectionalCollection.java diff --git a/grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/multitenancy/Tenants.groovy b/grails-datamapping-rx/src/main/groovy/grails/gorm/rx/multitenancy/Tenants.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/multitenancy/Tenants.groovy rename to grails-datamapping-rx/src/main/groovy/grails/gorm/rx/multitenancy/Tenants.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/proxy/ObservableProxy.java b/grails-datamapping-rx/src/main/groovy/grails/gorm/rx/proxy/ObservableProxy.java similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/proxy/ObservableProxy.java rename to grails-datamapping-rx/src/main/groovy/grails/gorm/rx/proxy/ObservableProxy.java diff --git a/grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/services/RxSchedule.java b/grails-datamapping-rx/src/main/groovy/grails/gorm/rx/services/RxSchedule.java similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/grails/gorm/rx/services/RxSchedule.java rename to grails-datamapping-rx/src/main/groovy/grails/gorm/rx/services/RxSchedule.java diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/AbstractRxDatastoreClient.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/AbstractRxDatastoreClient.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/AbstractRxDatastoreClient.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/AbstractRxDatastoreClient.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/RxDatastoreClient.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/RxDatastoreClient.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/RxDatastoreClient.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/RxDatastoreClient.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/RxDatastoreClientAware.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/RxDatastoreClientAware.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/RxDatastoreClientAware.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/RxDatastoreClientAware.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/batch/BatchOperation.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/batch/BatchOperation.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/batch/BatchOperation.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/batch/BatchOperation.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/collection/RxCollection.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/collection/RxCollection.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/collection/RxCollection.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/collection/RxCollection.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/collection/RxCollectionUtils.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/collection/RxCollectionUtils.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/collection/RxCollectionUtils.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/collection/RxCollectionUtils.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/collection/RxPersistentList.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/collection/RxPersistentList.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/collection/RxPersistentList.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/collection/RxPersistentList.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/collection/RxPersistentSet.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/collection/RxPersistentSet.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/collection/RxPersistentSet.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/collection/RxPersistentSet.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/collection/RxPersistentSortedSet.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/collection/RxPersistentSortedSet.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/collection/RxPersistentSortedSet.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/collection/RxPersistentSortedSet.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/exceptions/BlockingOperationException.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/exceptions/BlockingOperationException.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/exceptions/BlockingOperationException.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/exceptions/BlockingOperationException.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/internal/RxDatastoreClientImplementor.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/internal/RxDatastoreClientImplementor.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/internal/RxDatastoreClientImplementor.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/internal/RxDatastoreClientImplementor.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/proxy/AbstractObservableProxyMethodHandler.java b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/proxy/AbstractObservableProxyMethodHandler.java similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/proxy/AbstractObservableProxyMethodHandler.java rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/proxy/AbstractObservableProxyMethodHandler.java diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/proxy/IdQueryObservableProxyMethodHandler.java b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/proxy/IdQueryObservableProxyMethodHandler.java similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/proxy/IdQueryObservableProxyMethodHandler.java rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/proxy/IdQueryObservableProxyMethodHandler.java diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/proxy/IdentifierObservableProxyMethodHandler.java b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/proxy/IdentifierObservableProxyMethodHandler.java similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/proxy/IdentifierObservableProxyMethodHandler.java rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/proxy/IdentifierObservableProxyMethodHandler.java diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/proxy/ProxyFactory.java b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/proxy/ProxyFactory.java similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/proxy/ProxyFactory.java rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/proxy/ProxyFactory.java diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/proxy/QueryObservableProxyMethodHandler.java b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/proxy/QueryObservableProxyMethodHandler.java similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/proxy/QueryObservableProxyMethodHandler.java rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/proxy/QueryObservableProxyMethodHandler.java diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/proxy/RxJavassistProxyFactory.java b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/proxy/RxJavassistProxyFactory.java similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/proxy/RxJavassistProxyFactory.java rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/proxy/RxJavassistProxyFactory.java diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/query/QueryState.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/query/QueryState.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/query/QueryState.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/query/QueryState.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/query/RxQuery.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/query/RxQuery.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/query/RxQuery.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/query/RxQuery.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/query/RxQueryUtils.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/query/RxQueryUtils.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/query/RxQueryUtils.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/query/RxQueryUtils.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/query/event/PostQueryEvent.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/query/event/PostQueryEvent.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/datastore/rx/query/event/PostQueryEvent.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/datastore/rx/query/event/PostQueryEvent.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormEnhancer.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormEnhancer.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormEnhancer.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormEnhancer.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormInstanceApi.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormInstanceApi.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormInstanceApi.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormInstanceApi.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormStaticApi.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormStaticApi.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormStaticApi.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormStaticApi.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormValidationApi.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormValidationApi.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormValidationApi.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/api/RxGormValidationApi.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/api/multitenancy/TenantDelegatingRxGormOperations.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/api/multitenancy/TenantDelegatingRxGormOperations.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/api/multitenancy/TenantDelegatingRxGormOperations.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/api/multitenancy/TenantDelegatingRxGormOperations.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/config/Settings.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/config/Settings.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/config/Settings.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/config/Settings.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/events/AutoTimestampEventListener.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/events/AutoTimestampEventListener.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/events/AutoTimestampEventListener.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/events/AutoTimestampEventListener.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/events/DomainEventListener.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/events/DomainEventListener.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/events/DomainEventListener.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/events/DomainEventListener.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/events/MultiTenantEventListener.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/events/MultiTenantEventListener.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/events/MultiTenantEventListener.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/events/MultiTenantEventListener.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/events/ValidationEventListener.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/events/ValidationEventListener.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/events/ValidationEventListener.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/events/ValidationEventListener.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/finders/CountByFinder.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/finders/CountByFinder.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/finders/CountByFinder.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/finders/CountByFinder.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/finders/FindAllByBooleanFinder.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/finders/FindAllByBooleanFinder.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/finders/FindAllByBooleanFinder.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/finders/FindAllByBooleanFinder.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/finders/FindAllByFinder.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/finders/FindAllByFinder.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/finders/FindAllByFinder.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/finders/FindAllByFinder.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/finders/FindByBooleanFinder.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/finders/FindByBooleanFinder.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/finders/FindByBooleanFinder.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/finders/FindByBooleanFinder.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/finders/FindByFinder.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/finders/FindByFinder.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/finders/FindByFinder.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/finders/FindByFinder.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/finders/FindOrCreateByFinder.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/finders/FindOrCreateByFinder.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/finders/FindOrCreateByFinder.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/finders/FindOrCreateByFinder.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/finders/FindOrSaveByFinder.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/finders/FindOrSaveByFinder.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/finders/FindOrSaveByFinder.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/finders/FindOrSaveByFinder.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/services/implementers/ObservableResultAdapter.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/services/implementers/ObservableResultAdapter.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/services/implementers/ObservableResultAdapter.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/services/implementers/ObservableResultAdapter.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/services/implementers/ObservableServiceImplementerAdapter.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/services/implementers/ObservableServiceImplementerAdapter.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/services/implementers/ObservableServiceImplementerAdapter.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/services/implementers/ObservableServiceImplementerAdapter.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/services/implementers/SingleResultAdapter.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/services/implementers/SingleResultAdapter.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/services/implementers/SingleResultAdapter.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/services/implementers/SingleResultAdapter.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/services/support/RxServiceSupport.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/services/support/RxServiceSupport.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/services/support/RxServiceSupport.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/services/support/RxServiceSupport.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/transform/RxAstUtils.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/transform/RxAstUtils.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/transform/RxAstUtils.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/transform/RxAstUtils.groovy diff --git a/grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/transform/RxScheduleIOTransformation.groovy b/grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/transform/RxScheduleIOTransformation.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/main/groovy/org/grails/gorm/rx/transform/RxScheduleIOTransformation.groovy rename to grails-datamapping-rx/src/main/groovy/org/grails/gorm/rx/transform/RxScheduleIOTransformation.groovy diff --git a/grails-datastore-gorm-rx/src/main/resources/META-INF/services/org.grails.datastore.gorm.services.ServiceImplementerAdapter b/grails-datamapping-rx/src/main/resources/META-INF/services/org.grails.datastore.gorm.services.ServiceImplementerAdapter similarity index 100% rename from grails-datastore-gorm-rx/src/main/resources/META-INF/services/org.grails.datastore.gorm.services.ServiceImplementerAdapter rename to grails-datamapping-rx/src/main/resources/META-INF/services/org.grails.datastore.gorm.services.ServiceImplementerAdapter diff --git a/grails-datastore-gorm-rx/src/test/groovy/org/grails/gorm/rx/services/implementers/ObservableServiceTransformSpec.groovy b/grails-datamapping-rx/src/test/groovy/org/grails/gorm/rx/services/implementers/ObservableServiceTransformSpec.groovy similarity index 100% rename from grails-datastore-gorm-rx/src/test/groovy/org/grails/gorm/rx/services/implementers/ObservableServiceTransformSpec.groovy rename to grails-datamapping-rx/src/test/groovy/org/grails/gorm/rx/services/implementers/ObservableServiceTransformSpec.groovy diff --git a/grails-datamapping-support/build.gradle b/grails-datamapping-support/build.gradle index ef9791aee4d..0dffb55d474 100644 --- a/grails-datamapping-support/build.gradle +++ b/grails-datamapping-support/build.gradle @@ -23,11 +23,11 @@ dependencies { exclude group: 'org.springframework', module: 'spring-tx' } } - api project(':grails-datastore-gorm'), { + api project(':grails-datamapping-core'), { // api: AbstractDatastorePersistenceContextInterceptor // impl: GormEntityTransformation if (excludeUnusedTransDeps) { - // API dependencies in grails-datastore-gorm + // API dependencies in grails-datamapping-core exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' //exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' // Entity (test) exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' diff --git a/grails-datamapping-tck-domains/build.gradle b/grails-datamapping-tck-domains/build.gradle index 890651b8c19..fb27ab9c484 100644 --- a/grails-datamapping-tck-domains/build.gradle +++ b/grails-datamapping-tck-domains/build.gradle @@ -25,11 +25,11 @@ dependencies { } } - api project(':grails-datastore-gorm'), { + api project(':grails-datamapping-core'), { // api: ApplyDetachedCriteriaTransform, DetachedCriteria, DirtyCheck, Entity // impl: CascadingValidator, ConfigurableApplicationEventPublisher, GroovyProxyFactory, PagedResultList if (excludeUnusedTransDeps) { - // API dependencies in grails-datastore-gorm + // API dependencies in grails-datamapping-core exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api' exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' @@ -43,7 +43,7 @@ dependencies { // api: AsyncEntity if (excludeUnusedTransDeps) { // API dependencies in grails-datamapping-async - exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm' + exclude group: 'org.apache.grails.data', module: 'grails-datamapping-core' //exclude group: 'org.apache.grails.async', module: 'grails-async' // PromiseDecoratorProvider } } diff --git a/grails-datastore-core/build.gradle b/grails-datastore-core/build.gradle index e8e3d29ed01..78ab26c0298 100644 --- a/grails-datastore-core/build.gradle +++ b/grails-datastore-core/build.gradle @@ -49,7 +49,7 @@ dependencies { } - testImplementation project(':grails-datastore-gorm'), { + testImplementation project(':grails-datamapping-core'), { // we only need the @grails.gorm.annotation.Entity annotation to test GORM syntax mapping transitive = false } diff --git a/grails-testing-support-datamapping/build.gradle b/grails-testing-support-datamapping/build.gradle index 8222589efc1..8e35e5af127 100755 --- a/grails-testing-support-datamapping/build.gradle +++ b/grails-testing-support-datamapping/build.gradle @@ -45,7 +45,7 @@ dependencies { exclude group: 'org.springframework', module: 'spring-test' exclude group: 'org.apache.grails', module: 'grails-codecs' exclude group: 'org.apache.grails', module: 'grails-databinding' - exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm' + exclude group: 'org.apache.grails.data', module: 'grails-datamapping-core' exclude group: 'org.apache.grails', module: 'grails-test-core' exclude group: 'org.springframework.boot', module: 'spring-boot-test' exclude group: 'org.spockframework', module: 'spock-spring' @@ -67,7 +67,7 @@ dependencies { // impl: Converter } - implementation project(':grails-datastore-gorm'), { + implementation project(':grails-datamapping-core'), { // impl: GormEnhancer, UniqueConstraint if (excludeUnusedTransDeps) { // API dependencies in grails-datastore-gorm @@ -80,12 +80,12 @@ dependencies { exclude group: 'org.springframework', module: 'spring-tx' } } - api project(':grails-datastore-gorm-test'), { + api project(':grails-datamapping-core-test'), { // impl: SimpleMapDatastore if (excludeUnusedTransDeps) { - // API dependencies in grails-datastore-gorm-test + // API dependencies in grails-datamapping-core-test exclude group: 'org.apache.grails.data', module: 'grails-datastore-core' - exclude group: 'org.apache.grails.data', module: 'grails-datastore-gorm' + exclude group: 'org.apache.grails.data', module: 'grails-datamapping-core' exclude group: 'org.springframework', module: 'spring-context' exclude group: 'org.springframework', module: 'spring-core' exclude group: 'org.springframework', module: 'spring-tx' diff --git a/settings.gradle b/settings.gradle index 0772cb11e06..0bfa97336bf 100644 --- a/settings.gradle +++ b/settings.gradle @@ -32,7 +32,7 @@ include( 'grails-datastore-web', // Core GORM Implementation projects - 'grails-datastore-gorm', + 'grails-datamapping-core', 'grails-datastore-async', 'grails-datamapping-async', 'grails-datamapping-validation', @@ -41,11 +41,11 @@ include( 'grails-datamapping-tck-tests', 'grails-datamapping-tck-base', 'grails-datamapping-tck-domains', - 'grails-datastore-gorm-test', + 'grails-datamapping-core-test', // RX projects // until this can be finished ported to grails 7, we are disabling - //'grails-datastore-gorm-rx', + //'grails-datamapping-rx', // Testing Support 'grails-testing-support-datamapping', diff --git a/test-report/build.gradle b/test-report/build.gradle index 93c99b33b1f..801b59499b0 100644 --- a/test-report/build.gradle +++ b/test-report/build.gradle @@ -6,10 +6,10 @@ plugins { dependencies { testReportAggregation project(':grails-datastore-async') testReportAggregation project(':grails-datastore-core') - testReportAggregation project(':grails-datastore-gorm') + testReportAggregation project(':grails-datamapping-core') testReportAggregation project(':grails-datamapping-async') testReportAggregation project(':grails-datamapping-support') - testReportAggregation project(':grails-datastore-gorm-test') + testReportAggregation project(':grails-datamapping-core-test') testReportAggregation project(':grails-datamapping-validation') testReportAggregation project(':grails-datastore-web') }