fix for GRAILS-1756

git-svn-id: https://svn.codehaus.org/grails/trunk@6294 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: graeme

src/commons/org/codehaus/groovy/grails/commons/spring/GrailsRuntimeConfigurator.java

@@ -20,29 +20,35 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.codehaus.groovy.grails.commons.*;
+import org.codehaus.groovy.grails.exceptions.GrailsConfigurationException;
 import org.codehaus.groovy.grails.plugins.DefaultGrailsPluginManager;
 import org.codehaus.groovy.grails.plugins.GrailsPluginManager;
 import org.codehaus.groovy.grails.plugins.PluginManagerHolder;
-import org.codehaus.groovy.grails.exceptions.GrailsConfigurationException;
 import org.springframework.aop.framework.ProxyFactoryBean;
 import org.springframework.aop.target.HotSwappableTargetSource;
+import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.MethodInvokingFactoryBean;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.xml.XmlBeanFactory;
-import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.io.Resource;
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.transaction.interceptor.TransactionProxyFactoryBean;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 import org.springframework.web.context.WebApplicationContext;
 
 import javax.servlet.ServletContext;
 import java.io.IOException;
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
 
 /**
 * A class that handles the runtime configuration of the Grails ApplicationContext
@@ -76,8 +82,9 @@ public class GrailsRuntimeConfigurator implements ApplicationContextAware {
   private ApplicationContext parent;
   private boolean parentDataSource;
   private GrailsPluginManager pluginManager;
+  private boolean loadExternalPersistenceConfig;
 
-  public GrailsRuntimeConfigurator(GrailsApplication application) {
+    public GrailsRuntimeConfigurator(GrailsApplication application) {
       this(application, null);
   }
 
@@ -332,7 +339,8 @@ private void doPostResourceConfiguration(RuntimeSpringConfiguration springConfig
            if(springResources.exists()) {
               LOG.debug("[RuntimeConfiguration] Configuring additional beans from " +springResources.getURL());
               XmlBeanFactory xmlBf = new XmlBeanFactory(springResources);
-              xmlBf.setBeanClassLoader(Thread.currentThread().getContextClassLoader());
+               ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+               xmlBf.setBeanClassLoader(classLoader);
               String[] beanNames = xmlBf.getBeanDefinitionNames();
               LOG.debug("[RuntimeConfiguration] Found ["+beanNames.length+"] beans to configure");
               for (int k = 0; k < beanNames.length; k++) {
@@ -345,8 +353,15 @@ private void doPostResourceConfiguration(RuntimeSpringConfiguration springConfig
                   BeanDefinition bd = xmlBf.getBeanDefinition(beanNames[k]);
 
                   springConfig.addBeanDefinition(beanNames[k], bd);
+                  Class beanClass = ClassUtils.forName(bd.getBeanClassName(), classLoader);
+                  if(BeanFactoryPostProcessor.class.isAssignableFrom(beanClass)) {
+                       ((ConfigurableApplicationContext)springConfig.getUnrefreshedApplicationContext())
+                               .addBeanFactoryPostProcessor((BeanFactoryPostProcessor)xmlBf.getBean(beanNames[k]));                                           
+                  }
               }
 
+
+
            }
            else if(LOG.isDebugEnabled()) {
                LOG.debug("[RuntimeConfiguration] " + GrailsRuntimeConfigurator.SPRING_RESOURCES_XML + " not found. Skipping configuration.");
@@ -357,12 +372,15 @@ else if(LOG.isDebugEnabled()) {
                bb.setSpringConfig(springConfig);
                bb.loadBeans(groovySpringResources);
            }
+
+           
       } catch (Exception ex) {
           LOG.warn("[RuntimeConfiguration] Unable to perform post initialization config: " + SPRING_RESOURCES_XML , ex);
       }
   }
 
   public void setLoadExternalPersistenceConfig(boolean b) {
+      this.loadExternalPersistenceConfig = b;
   }
 
   public void setPluginManager(GrailsPluginManager manager) {

src/groovy/org/codehaus/groovy/grails/plugins/CoreGrailsPlugin.groovy

@@ -23,7 +23,6 @@ import org.springframework.beans.factory.config.MethodInvokingFactoryBean
 import org.codehaus.groovy.runtime.InvokerHelper
 import org.codehaus.groovy.grails.commons.cfg.GrailsOverrideConfigurer
 import org.codehaus.groovy.grails.commons.cfg.GrailsPlaceholderConfigurer
-import org.codehaus.groovy.grails.orm.support.TransactionManagerPostProcessor;
 
 /**
  * A plug-in that configures the core shared beans within the Grails application context 
@@ -40,8 +39,8 @@ class CoreGrailsPlugin {
 	def doWithSpring = {
         addBeanFactoryPostProcessor(new GrailsOverrideConfigurer())
         addBeanFactoryPostProcessor(new GrailsPlaceholderConfigurer())
-        addBeanFactoryPostProcessor(new TransactionManagerPostProcessor())
-        
+
+
         classLoader(MethodInvokingFactoryBean) {
 			targetObject = ref("grailsApplication", true)
 			targetMethod = "getClassLoader"

src/groovy/org/codehaus/groovy/grails/plugins/datasource/DataSourceGrailsPlugin.groovy

@@ -20,6 +20,7 @@ import org.apache.commons.dbcp.BasicDataSource
 import org.springframework.jdbc.datasource.DriverManagerDataSource
 import org.springframework.jndi.JndiObjectFactoryBean
 import javax.sql.DataSource
+import org.codehaus.groovy.grails.orm.support.TransactionManagerPostProcessor
 
 /**
  * A plug-in that handles the configuration of Hibernate within Grails 
@@ -35,7 +36,9 @@ class DataSourceGrailsPlugin {
 	def watchedResources = "**/grails-app/conf/DataSource.groovy"
 
 	def doWithSpring = {
-		def ds = application.config.dataSource
+        addBeanFactoryPostProcessor(new TransactionManagerPostProcessor())
+                
+        def ds = application.config.dataSource
 		if(ds || application.domainClasses.size() > 0) {
             if(ds.jndiName) {
                 dataSource(JndiObjectFactoryBean) {