Use GORM Entity instead of grails.persistence.Entity

Closes gh-64

Author: rainboyan

grace-datastore-gorm-support/src/test/groovy/org/grails/datastore/gorm/GormEntityTraitSpec.groovy

@@ -1,7 +1,7 @@
 package org.grails.datastore.gorm
 
 import grails.artefact.Artefact
-import grails.persistence.Entity
+import grails.gorm.annotation.Entity
 import org.grails.datastore.gorm.query.GormQueryOperations
 import org.grails.datastore.mapping.dirty.checking.DirtyCheckable
 import org.grails.datastore.mapping.model.config.GormProperties
@@ -35,7 +35,7 @@ class GormEntityTraitSpec extends Specification {
     void "Test dynamic parse"(){
         when:
         def cls = new GroovyClassLoader().parseClass('''
-import grails.persistence.*
+import grails.gorm.annotation.Entity
 
 @Entity
 class Book {
@@ -92,7 +92,7 @@ class Publisher {
         def cl = new GroovyClassLoader()
         when:
         def cls = cl.parseClass('''
-import grails.persistence.*
+import grails.gorm.annotation.Entity
 
 @Entity
 class Group {
@@ -134,6 +134,7 @@ class SubMember extends Member {
         cls.getAnnotation(grails.gorm.annotation.Entity)
         ClassPropertyFetcher.forClass(SubMember).getStaticPropertyValuesFromInheritanceHierarchy(GormProperties.TRANSIENT, Collection) ==  [[], ["transientProperty"]]
     }
+
     void "test that a class marked with @Artefact('Domain') is enhanced with GormEntityTraitSpec"() {
         expect:
         GormEntity.isAssignableFrom QueryMethodArtefactDomain
@@ -156,7 +157,7 @@ class SubMember extends Member {
     }
 }
 
-@Artefact('Domain')
+@Entity
 class QueryMethodArtefactDomain {
     String name
 }

grace-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/ChildEntity.groovy

@@ -1,6 +1,6 @@
 package grails.gorm.tests
 
-import grails.persistence.Entity
+import grails.gorm.annotation.Entity
 
 /**
  * @author graemerocher

grace-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/CircularOneToManySpec.groovy

@@ -1,6 +1,6 @@
 package grails.gorm.tests
 
-import grails.persistence.Entity
+import grails.gorm.annotation.Entity
 
 /**
  * @author graemerocher

grace-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/ClassWithHungarianNotation.groovy

@@ -1,6 +1,6 @@
 package grails.gorm.tests
 
-import grails.persistence.Entity
+import grails.gorm.annotation.Entity
 
 /**
  * @author sdelamo

grace-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/ClassWithListArgBeforeValidate.groovy

@@ -1,6 +1,6 @@
 package grails.gorm.tests
 
-import grails.persistence.Entity
+import grails.gorm.annotation.Entity
 
 @Entity
 class ClassWithListArgBeforeValidate implements Serializable {

grace-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/ClassWithNoArgBeforeValidate.groovy

@@ -1,6 +1,6 @@
 package grails.gorm.tests
 
-import grails.persistence.Entity;
+import grails.gorm.annotation.Entity;
 
 @Entity
 class ClassWithNoArgBeforeValidate implements Serializable {

grace-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/ClassWithOverloadedBeforeValidate.groovy

@@ -1,6 +1,6 @@
 package grails.gorm.tests
 
-import grails.persistence.Entity
+import grails.gorm.annotation.Entity
 
 @Entity
 class ClassWithOverloadedBeforeValidate implements Serializable {

grace-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/CommonTypesPersistenceSpec.groovy

@@ -1,6 +1,6 @@
 package grails.gorm.tests
 
-import grails.persistence.Entity
+import grails.gorm.annotation.Entity
 
 /**
  * @author graemerocher

grace-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/ConstraintsSpec.groovy

@@ -1,6 +1,6 @@
 package grails.gorm.tests
 
-import grails.persistence.Entity
+import grails.gorm.annotation.Entity
 
 class ConstraintsSpec extends GormDatastoreSpec {
 

grace-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/DirtyCheckingAfterListenerSpec.groovy

@@ -1,6 +1,6 @@
 package grails.gorm.tests
 
-import grails.persistence.Entity
+import grails.gorm.annotation.Entity
 import org.grails.datastore.gorm.events.ConfigurableApplicationEventPublisher
 import org.grails.datastore.mapping.core.Datastore
 import org.grails.datastore.mapping.engine.event.AbstractPersistenceEvent