Merge branch '2.1.x' into 2.2.x

Conflicts:
	build.gradle
	build.properties
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java

Author: graemerocher

build.gradle

@@ -24,7 +24,7 @@ ext {
     commonsCollectionsVersion = "3.2.1"
     commonsIOVersion = "2.1"
     commonsLangVersion = "2.6"
-    datastoreVersion = "1.1.4.BUILD-SNAPSHOT"
+    datastoreVersion = "1.1.4.RELEASE"
     gantVersion = "1.9.6"
     gdocEngineVersion = "1.0.1"
     groovyVersion = "2.0.7"

grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java

@@ -172,7 +172,7 @@ public Object doCall() {
                         };
                         registerDependencies(dependencyManager, compileTimeDependenciesMethod, commonsExcludingLoggingAndXmlApis, "commons-logging", "xml-apis", "commons-digester");
 
-                        String datastoreMappingVersion = "1.1.4.BUILD-SNAPSHOT";
+                        String datastoreMappingVersion = "1.1.4.RELEASE";
                         ModuleRevisionId[] compileDependencies = {
                             ModuleRevisionId.newInstance("aopalliance", "aopalliance", "1.0"),
                             ModuleRevisionId.newInstance("com.googlecode.concurrentlinkedhashmap", "concurrentlinkedhashmap-lru", "1.3.1"),

grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/EventTriggeringInterceptor.java

@@ -25,14 +25,20 @@
 
 import org.codehaus.groovy.grails.commons.AnnotationDomainClassArtefactHandler;
 import org.codehaus.groovy.grails.commons.DomainClassArtefactHandler;
+import org.codehaus.groovy.grails.commons.GrailsApplication;
+import org.codehaus.groovy.grails.commons.GrailsDomainClass;
+import org.codehaus.groovy.grails.commons.GrailsDomainClassProperty;
+import org.codehaus.groovy.grails.orm.hibernate.cfg.GrailsDomainBinder;
 import org.codehaus.groovy.grails.orm.hibernate.cfg.GrailsHibernateUtil;
+import org.codehaus.groovy.grails.orm.hibernate.cfg.Mapping;
 import org.codehaus.groovy.grails.orm.hibernate.support.ClosureEventListener;
 import org.codehaus.groovy.grails.orm.hibernate.support.SoftKey;
 import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
 import org.grails.datastore.mapping.engine.event.AbstractPersistenceEvent;
 import org.grails.datastore.mapping.engine.event.AbstractPersistenceEventListener;
 import org.grails.datastore.mapping.engine.event.ValidationEvent;
 import org.hibernate.HibernateException;
+import org.hibernate.SessionFactory;
 import org.hibernate.event.PostDeleteEvent;
 import org.hibernate.event.PostInsertEvent;
 import org.hibernate.event.PostLoadEvent;
@@ -42,6 +48,9 @@
 import org.hibernate.event.PreLoadEvent;
 import org.hibernate.event.PreUpdateEvent;
 import org.hibernate.event.SaveOrUpdateEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationEvent;
 
 /**
@@ -61,6 +70,8 @@ public class EventTriggeringInterceptor extends AbstractPersistenceEventListener
     private boolean failOnError;
     private List<?> failOnErrorPackages = Collections.emptyList();
 
+    protected Logger log = LoggerFactory.getLogger(getClass());
+
     public EventTriggeringInterceptor(HibernateDatastore datastore, ConfigObject co) {
         super(datastore);
 
@@ -211,10 +222,9 @@ private ClosureEventListener findEventListener(Object entity) {
             synchronized(clazz) {
                 eventListener = eventListeners.get(key);
                 if (eventListener == null) {
-                    shouldTrigger = (entity != null &&
-                            (GroovySystem.getMetaClassRegistry().getMetaClass(entity.getClass()) != null) &&
-                            (DomainClassArtefactHandler.isDomainClass(clazz) ||
-                                    AnnotationDomainClassArtefactHandler.isJPADomainClass(clazz)));
+                    shouldTrigger = (GroovySystem.getMetaClassRegistry().getMetaClass(entity.getClass()) != null &&
+                            (DomainClassArtefactHandler.isDomainClass(clazz) || AnnotationDomainClassArtefactHandler.isJPADomainClass(clazz)) &&
+                            isDefinedByCurrentDataStore(entity));
                     if (shouldTrigger) {
                         eventListener = new ClosureEventListener(clazz, failOnError, failOnErrorPackages);
                         ClosureEventListener previous = eventListeners.putIfAbsent(key, eventListener);
@@ -229,6 +239,49 @@ private ClosureEventListener findEventListener(Object entity) {
         return eventListener;
     }
 
+    protected boolean isDefinedByCurrentDataStore(Object entity) {
+        SessionFactory currentDataStoreSessionFactory = ((HibernateDatastore) datastore).getSessionFactory();
+        ApplicationContext applicationContext = datastore.getApplicationContext();
+
+        Mapping mapping = GrailsDomainBinder.getMapping(entity.getClass());
+        List<String> dataSourceNames = null;
+        if (mapping == null) {
+            GrailsApplication grailsApplication = applicationContext.getBean("grailsApplication", GrailsApplication.class);
+            GrailsDomainClass dc = (GrailsDomainClass) grailsApplication.getArtefact(DomainClassArtefactHandler.TYPE, entity.getClass().getName());
+            if (dc != null) {
+                dataSourceNames = GrailsHibernateUtil.getDatasourceNames(dc);
+            }
+        }
+        else {
+            dataSourceNames = mapping.getDatasources();
+        }
+
+        if (dataSourceNames == null) {
+            return false;
+        }
+
+        for (String dataSource : dataSourceNames) {
+            if (GrailsDomainClassProperty.ALL_DATA_SOURCES.equals(dataSource)) {
+                return true;
+            }
+            boolean isDefault = dataSource.equals(GrailsDomainClassProperty.DEFAULT_DATA_SOURCE);
+            String suffix = isDefault ? "" : "_" + dataSource;
+            String sessionFactoryBeanName = "sessionFactory" + suffix;
+
+            if (applicationContext.containsBean(sessionFactoryBeanName)) {
+                SessionFactory sessionFactory = applicationContext.getBean(sessionFactoryBeanName, SessionFactory.class);
+                if (currentDataStoreSessionFactory == sessionFactory) {
+                    return true;
+                }
+            }
+            else {
+                log.warn("Cannot resolve SessionFactory for dataSource {} and entity {}",
+                        new Object[] { dataSource, entity.getClass().getName()});
+            }
+        }
+        return false;
+    }
+
     /**
      * {@inheritDoc}
      * @see org.springframework.context.event.SmartApplicationListener#supportsEventType(