From 767696f74079f29da06c535b40c6ba4d6ba38802 Mon Sep 17 00:00:00 2001
From: Graeme Rocher <graeme.rocher@gmail.com>
Date: Mon, 27 Sep 2010 09:25:42 +0200
Subject: [PATCH] GrailsAnnotationConfiguration was missing the feature from
 DefaultGrailsDomainConfiguration to specify an alternative mapping strategy

---
 .../orm/hibernate/cfg/GrailsAnnotationConfiguration.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/java/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsAnnotationConfiguration.java b/src/java/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsAnnotationConfiguration.java
index fe964ed15d2..98c37297663 100644
--- a/src/java/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsAnnotationConfiguration.java
+++ b/src/java/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsAnnotationConfiguration.java
@@ -53,13 +53,17 @@ public class GrailsAnnotationConfiguration extends AnnotationConfiguration imple
      * @see org.codehaus.groovy.grails.orm.hibernate.cfg.GrailsDomainConfiguration#addDomainClass(org.codehaus.groovy.grails.commons.GrailsDomainClass)
      */
     public GrailsDomainConfiguration addDomainClass(GrailsDomainClass domainClass) {
-        if (!AnnotationDomainClassArtefactHandler.isJPADomainClass(domainClass.getClazz())) {
+        if (shouldMapWithGorm(domainClass)) {
             domainClasses.add(domainClass);
         }
 
         return this;
     }
 
+    private boolean shouldMapWithGorm(GrailsDomainClass domainClass) {
+        return !AnnotationDomainClassArtefactHandler.isJPADomainClass(domainClass.getClazz()) && domainClass.getMappingStrategy().equalsIgnoreCase(GrailsDomainClass.GORM);
+    }
+
     /* (non-Javadoc)
      * @see org.codehaus.groovy.grails.orm.hibernate.cfg.GrailsDomainConfiguration#setGrailsApplication(org.codehaus.groovy.grails.commons.GrailsApplication)
      */