refactor org.codehaus.* -> org.grails.* for grails-spring

grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/commons/spring/GrailsApplicationContext.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2004-2005 Graeme Rocher
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.codehaus.groovy.grails.commons.spring;
+
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.context.ApplicationContext;
+
+/**
+ * An ApplicationContext that extends StaticApplicationContext and implements GroovyObject such that
+ * beans can be retrieved with the dot de-reference syntax instead of using getBean('name').
+ *
+ * @author Graeme Rocher
+ * @since 1.0
+ * @deprecated Use {@link org.grails.spring.GrailsApplicationContext}
+ */
+@Deprecated
+public class GrailsApplicationContext extends org.grails.spring.GrailsApplicationContext {
+
+    public GrailsApplicationContext(DefaultListableBeanFactory defaultListableBeanFactory) {
+        super(defaultListableBeanFactory);
+    }
+
+    public GrailsApplicationContext(DefaultListableBeanFactory defaultListableBeanFactory, ApplicationContext applicationContext) {
+        super(defaultListableBeanFactory, applicationContext);
+    }
+
+    public GrailsApplicationContext(org.springframework.context.ApplicationContext parent) throws org.springframework.beans.BeansException {
+        super(parent);
+    }
+
+    public GrailsApplicationContext() throws org.springframework.beans.BeansException {
+        super();
+    }
+}

grails-core/src/main/groovy/org/codehaus/groovy/grails/commons/spring/RuntimeSpringConfigUtilities.java

@@ -26,6 +26,7 @@
 import org.codehaus.groovy.grails.commons.GrailsApplication;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.util.ClassUtils;
+import org.grails.spring.RuntimeSpringConfiguration;
 
 /**
  * @since 2.4

grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/AbstractGrailsPluginManager.java

@@ -37,7 +37,7 @@
 import org.codehaus.groovy.grails.commons.ArtefactHandler;
 import org.codehaus.groovy.grails.commons.GrailsApplication;
 import org.codehaus.groovy.grails.commons.cfg.ConfigurationHelper;
-import org.codehaus.groovy.grails.commons.spring.RuntimeSpringConfiguration;
+import org.grails.spring.RuntimeSpringConfiguration;
 import org.codehaus.groovy.grails.io.support.GrailsResourceUtils;
 import org.codehaus.groovy.grails.plugins.exceptions.PluginException;
 import org.codehaus.groovy.runtime.DefaultGroovyMethods;

grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/CoreGrailsPlugin.groovy

@@ -26,10 +26,10 @@ import org.codehaus.groovy.grails.aop.framework.autoproxy.GroovyAwareInfrastruct
 import org.codehaus.groovy.grails.commons.GrailsApplication
 import org.codehaus.groovy.grails.commons.cfg.GrailsPlaceholderConfigurer
 import org.codehaus.groovy.grails.commons.cfg.MapBasedSmartPropertyOverrideConfigurer
-import org.codehaus.groovy.grails.commons.spring.DefaultRuntimeSpringConfiguration
+import org.grails.spring.DefaultRuntimeSpringConfiguration
 import org.codehaus.groovy.grails.commons.spring.OptimizedAutowireCapableBeanFactory
 import org.codehaus.groovy.grails.commons.spring.RuntimeSpringConfigUtilities
-import org.codehaus.groovy.grails.commons.spring.RuntimeSpringConfiguration
+import org.grails.spring.RuntimeSpringConfiguration
 import org.codehaus.groovy.grails.core.io.DefaultResourceLocator
 import org.codehaus.groovy.grails.plugins.support.aware.GrailsApplicationAware
 import org.codehaus.groovy.grails.plugins.support.aware.GrailsApplicationAwareBeanPostProcessor
@@ -92,7 +92,7 @@ class CoreGrailsPlugin implements GrailsApplicationAware {
         }
 
         grailsApplicationPostProcessor(GrailsApplicationAwareBeanPostProcessor, ref("grailsApplication"))
-        
+
         if (getParentCtx()?.containsBean('pluginManager')) {
             pluginManagerPostProcessor(PluginManagerAwareBeanPostProcessor, ref('pluginManager'))
         } else {

grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/DefaultGrailsPlugin.java

@@ -43,7 +43,7 @@
 import org.codehaus.groovy.grails.commons.GrailsApplication;
 import org.codehaus.groovy.grails.commons.GrailsArrayUtils;
 import org.codehaus.groovy.grails.commons.GrailsClassUtils;
-import org.codehaus.groovy.grails.commons.spring.RuntimeSpringConfiguration;
+import org.grails.spring.RuntimeSpringConfiguration;
 import org.codehaus.groovy.grails.core.io.SpringResource;
 import org.codehaus.groovy.grails.exceptions.GrailsConfigurationException;
 import org.codehaus.groovy.grails.plugins.exceptions.PluginException;

grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/DefaultGrailsPluginManager.java

@@ -23,8 +23,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.codehaus.groovy.control.CompilationFailedException;
 import org.codehaus.groovy.grails.commons.GrailsApplication;
-import org.codehaus.groovy.grails.commons.spring.DefaultRuntimeSpringConfiguration;
-import org.codehaus.groovy.grails.commons.spring.RuntimeSpringConfiguration;
+import org.grails.spring.DefaultRuntimeSpringConfiguration;
+import org.grails.spring.RuntimeSpringConfiguration;
 import org.codehaus.groovy.grails.exceptions.GrailsConfigurationException;
 import org.codehaus.groovy.grails.io.support.GrailsResourceUtils;
 import org.codehaus.groovy.grails.plugins.exceptions.PluginException;

grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/GrailsPlugin.java

@@ -24,7 +24,7 @@
 import java.util.Map;
 
 import org.codehaus.groovy.grails.commons.GrailsApplication;
-import org.codehaus.groovy.grails.commons.spring.RuntimeSpringConfiguration;
+import org.grails.spring.RuntimeSpringConfiguration;
 import org.codehaus.groovy.grails.plugins.support.WatchPattern;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;

grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/GrailsPluginManager.java

@@ -22,7 +22,7 @@
 import java.util.Map;
 
 import org.codehaus.groovy.grails.commons.GrailsApplication;
-import org.codehaus.groovy.grails.commons.spring.RuntimeSpringConfiguration;
+import org.grails.spring.RuntimeSpringConfiguration;
 import org.codehaus.groovy.grails.plugins.exceptions.PluginException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;

grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/ProfilingGrailsPluginManager.java

@@ -19,7 +19,7 @@
 import groovy.lang.GroovySystem;
 import groovy.lang.MetaClassRegistry;
 import org.codehaus.groovy.grails.commons.GrailsApplication;
-import org.codehaus.groovy.grails.commons.spring.RuntimeSpringConfiguration;
+import org.grails.spring.RuntimeSpringConfiguration;
 import org.codehaus.groovy.grails.plugins.exceptions.PluginException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.io.Resource;

grails-plugin-gsp/src/main/groovy/org/codehaus/groovy/grails/plugins/web/GroovyPagesGrailsPlugin.groovy

@@ -22,7 +22,7 @@ import grails.util.Environment
 import grails.util.GrailsUtil
 import groovy.transform.CompileStatic
 import org.codehaus.groovy.grails.commons.*
-import org.codehaus.groovy.grails.commons.spring.RuntimeSpringConfiguration
+import org.grails.spring.RuntimeSpringConfiguration
 import org.codehaus.groovy.grails.plugins.GrailsPluginManager
 import org.codehaus.groovy.grails.plugins.GrailsPluginUtils
 import org.codehaus.groovy.grails.plugins.PluginManagerAware

grails-plugin-services/src/main/groovy/org/codehaus/groovy/grails/plugins/services/ServiceBeanAliasPostProcessor.groovy

@@ -19,7 +19,7 @@ import grails.util.GrailsNameUtils
 import groovy.transform.CompileStatic
 
 import org.codehaus.groovy.grails.commons.ServiceArtefactHandler
-import org.codehaus.groovy.grails.commons.spring.TypeSpecifyableTransactionProxyFactoryBean
+import org.grails.spring.TypeSpecifyableTransactionProxyFactoryBean
 import org.springframework.beans.BeansException
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory

grails-plugin-services/src/main/groovy/org/codehaus/groovy/grails/plugins/services/ServicesGrailsPlugin.groovy

@@ -23,7 +23,7 @@ import java.lang.reflect.Modifier
 
 import org.codehaus.groovy.grails.commons.GrailsServiceClass
 import org.codehaus.groovy.grails.commons.ServiceArtefactHandler
-import org.codehaus.groovy.grails.commons.spring.TypeSpecifyableTransactionProxyFactoryBean
+import org.grails.spring.TypeSpecifyableTransactionProxyFactoryBean
 import org.codehaus.groovy.grails.orm.support.GroovyAwareNamedTransactionAttributeSource
 import org.springframework.beans.factory.config.MethodInvokingFactoryBean
 import org.springframework.core.annotation.AnnotationUtils

grails-plugin-testing/src/main/groovy/grails/test/runtime/GrailsApplicationTestPlugin.groovy

@@ -37,7 +37,7 @@ import org.codehaus.groovy.grails.commons.GrailsApplication
 import org.codehaus.groovy.grails.commons.cfg.ConfigurationHelper
 import grails.web.servlet.context.GrailsWebApplicationContext
 import org.codehaus.groovy.grails.commons.spring.OptimizedAutowireCapableBeanFactory;
-import org.codehaus.groovy.grails.commons.spring.RuntimeSpringConfiguration
+import org.grails.spring.RuntimeSpringConfiguration
 import org.grails.web.servlet.context.support.WebRuntimeSpringConfiguration;
 import org.codehaus.groovy.grails.lifecycle.ShutdownOperations
 import org.codehaus.groovy.grails.plugins.converters.ConvertersPluginSupport

grails-plugin-testing/src/main/groovy/grails/test/runtime/NoOpGrailsPluginManager.java

@@ -7,7 +7,7 @@
 import java.util.Map;
 
 import org.codehaus.groovy.grails.commons.GrailsApplication;
-import org.codehaus.groovy.grails.commons.spring.RuntimeSpringConfiguration;
+import org.grails.spring.RuntimeSpringConfiguration;
 import org.codehaus.groovy.grails.plugins.GrailsPlugin;
 import org.codehaus.groovy.grails.plugins.GrailsPluginManager;
 import org.codehaus.groovy.grails.plugins.exceptions.PluginException;

grails-project-api/src/main/groovy/org/codehaus/groovy/grails/project/loader/GrailsProjectLoader.groovy

@@ -28,7 +28,7 @@ import org.codehaus.groovy.grails.cli.support.GrailsBuildEventListener
 import org.codehaus.groovy.grails.commons.ApplicationAttributes
 import org.codehaus.groovy.grails.commons.DefaultGrailsApplication
 import org.codehaus.groovy.grails.commons.GrailsApplication
-import org.codehaus.groovy.grails.commons.spring.GrailsApplicationContext
+import org.grails.spring.GrailsApplicationContext
 import org.grails.web.servlet.context.support.GrailsRuntimeConfigurator
 import grails.web.servlet.context.GrailsWebApplicationContext
 import org.codehaus.groovy.grails.project.compiler.GrailsProjectCompiler

grails-spring/src/main/groovy/grails/spring/BeanBuilder.java

@@ -34,10 +34,10 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.codehaus.groovy.grails.commons.spring.BeanConfiguration;
-import org.codehaus.groovy.grails.commons.spring.DefaultBeanConfiguration;
-import org.codehaus.groovy.grails.commons.spring.DefaultRuntimeSpringConfiguration;
-import org.codehaus.groovy.grails.commons.spring.RuntimeSpringConfiguration;
+import org.grails.spring.BeanConfiguration;
+import org.grails.spring.DefaultBeanConfiguration;
+import org.grails.spring.DefaultRuntimeSpringConfiguration;
+import org.grails.spring.RuntimeSpringConfiguration;
 import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.codehaus.groovy.runtime.InvokerHelper;
 import org.springframework.beans.factory.config.BeanDefinition;

grails-spring/src/main/groovy/grails/spring/DynamicElementReader.groovy

@@ -17,7 +17,7 @@ package grails.spring
 
 import groovy.xml.StreamingMarkupBuilder
 import org.apache.commons.logging.LogFactory
-import org.codehaus.groovy.grails.commons.spring.BeanConfiguration
+import org.grails.spring.BeanConfiguration
 import org.springframework.beans.factory.config.BeanDefinitionHolder
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException
 import org.springframework.beans.factory.parsing.Location

grails-spring/src/main/groovy/org/codehaus/groovy/grails/commons/spring/BeanConfiguration.java → grails-spring/src/main/groovy/org/grails/spring/BeanConfiguration.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.codehaus.groovy.grails.commons.spring;
+package org.grails.spring;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;

grails-spring/src/main/groovy/org/codehaus/groovy/grails/commons/spring/DefaultBeanConfiguration.java → grails-spring/src/main/groovy/org/grails/spring/DefaultBeanConfiguration.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.codehaus.groovy.grails.commons.spring;
+package org.grails.spring;
 
 import groovy.lang.GroovyObjectSupport;
 

grails-spring/src/main/groovy/org/codehaus/groovy/grails/commons/spring/DefaultRuntimeSpringConfiguration.java → grails-spring/src/main/groovy/org/grails/spring/DefaultRuntimeSpringConfiguration.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.codehaus.groovy.grails.commons.spring;
+package org.grails.spring;
 
 import groovy.lang.GroovySystem;
 import groovy.lang.MetaClass;

grails-spring/src/main/groovy/org/codehaus/groovy/grails/commons/spring/GrailsApplicationContext.java → grails-spring/src/main/groovy/org/grails/spring/GrailsApplicationContext.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.codehaus.groovy.grails.commons.spring;
+package org.grails.spring;
 
 import groovy.lang.GroovyObject;
 import groovy.lang.GroovySystem;
@@ -65,7 +65,7 @@ public GrailsApplicationContext(org.springframework.context.ApplicationContext p
     public GrailsApplicationContext() throws org.springframework.beans.BeansException {
         metaClass = GroovySystem.getMetaClassRegistry().getMetaClass(getClass());
     }
-    
+
     @Override
     public boolean containsBeanDefinition(String beanName) {
         if(super.containsBeanDefinition(beanName)) {
@@ -180,7 +180,7 @@ protected void prepareBeanFactory(ConfigurableListableBeanFactory beanFactory) {
         ((DefaultListableBeanFactory)beanFactory).destroySingleton(ENVIRONMENT_BEAN_NAME);
         beanFactory.registerSingleton(GRAILS_ENVIRONMENT_BEAN_NAME,getEnvironment());
     }
-    
+
     @Override
     protected void assertBeanFactoryActive() {
         // no-op to prevent excessive synchronization caused by SPR-10307 change

grails-spring/src/main/groovy/org/codehaus/groovy/grails/commons/spring/GrailsContextEvent.java → grails-spring/src/main/groovy/org/grails/spring/GrailsContextEvent.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.codehaus.groovy.grails.commons.spring;
+package org.grails.spring;
 
 import org.springframework.context.ApplicationEvent;
 import org.springframework.web.context.WebApplicationContext;

grails-spring/src/main/groovy/org/codehaus/groovy/grails/commons/spring/RuntimeSpringConfiguration.java → grails-spring/src/main/groovy/org/grails/spring/RuntimeSpringConfiguration.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.codehaus.groovy.grails.commons.spring;
+package org.grails.spring;
 
 import java.util.Collection;
 import java.util.List;

grails-spring/src/main/groovy/org/codehaus/groovy/grails/commons/spring/TypeSpecifyableTransactionProxyFactoryBean.java → grails-spring/src/main/groovy/org/grails/spring/TypeSpecifyableTransactionProxyFactoryBean.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.codehaus.groovy.grails.commons.spring;
+package org.grails.spring;
 
 import org.springframework.transaction.interceptor.TransactionProxyFactoryBean;
 

grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/plugins/DefaultGrailsPluginTests.java

@@ -15,8 +15,8 @@
  */
 package org.codehaus.groovy.grails.plugins;
 
-import org.codehaus.groovy.grails.commons.spring.DefaultRuntimeSpringConfiguration;
-import org.codehaus.groovy.grails.commons.spring.RuntimeSpringConfiguration;
+import org.grails.spring.DefaultRuntimeSpringConfiguration;
+import org.grails.spring.RuntimeSpringConfiguration;
 import org.codehaus.groovy.grails.commons.test.AbstractGrailsMockTests;
 import org.codehaus.groovy.grails.plugins.exceptions.PluginException;
 import org.springframework.context.ApplicationContext;

grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/context/support/GrailsRuntimeConfiguratorTests.java

@@ -2,10 +2,10 @@
 
 import grails.util.Holders;
 import grails.util.Metadata;
-import org.codehaus.groovy.grails.commons.spring.BeanConfiguration;
-import org.codehaus.groovy.grails.commons.spring.DefaultRuntimeSpringConfiguration;
-import org.codehaus.groovy.grails.commons.spring.GrailsApplicationContext;
-import org.codehaus.groovy.grails.commons.spring.RuntimeSpringConfiguration;
+import org.grails.spring.BeanConfiguration;
+import org.grails.spring.DefaultRuntimeSpringConfiguration;
+import org.grails.spring.GrailsApplicationContext;
+import org.grails.spring.RuntimeSpringConfiguration;
 import org.grails.web.servlet.context.support.GrailsRuntimeConfigurator;
 import groovy.lang.ExpandoMetaClass;
 import groovy.lang.GroovyClassLoader;

grails-web-boot/src/main/groovy/org/grails/boot/support/GrailsApplicationPostProcessor.groovy

@@ -4,7 +4,7 @@ import grails.util.Holders
 import groovy.transform.CompileStatic
 import org.codehaus.groovy.grails.commons.DefaultGrailsApplication
 import org.codehaus.groovy.grails.commons.GrailsApplication
-import org.codehaus.groovy.grails.commons.spring.DefaultRuntimeSpringConfiguration
+import org.grails.spring.DefaultRuntimeSpringConfiguration
 import org.codehaus.groovy.grails.lifecycle.ShutdownOperations
 import org.codehaus.groovy.grails.plugins.DefaultGrailsPluginManager
 import org.codehaus.groovy.grails.plugins.GrailsPluginManager

grails-web/src/main/groovy/grails/spring/WebBeanBuilder.java

@@ -15,7 +15,7 @@
  */
 package grails.spring;
 
-import org.codehaus.groovy.grails.commons.spring.RuntimeSpringConfiguration;
+import org.grails.spring.RuntimeSpringConfiguration;
 import org.grails.web.servlet.context.support.WebRuntimeSpringConfiguration;
 import org.springframework.context.ApplicationContext;
 

grails-web/src/main/groovy/grails/web/servlet/context/GrailsWebApplicationContext.java

@@ -22,7 +22,7 @@
 
 import org.codehaus.groovy.grails.commons.GrailsApplication;
 import grails.web.servlet.context.support.GrailsEnvironment;
-import org.codehaus.groovy.grails.commons.spring.GrailsApplicationContext;
+import org.grails.spring.GrailsApplicationContext;
 import org.codehaus.groovy.grails.commons.spring.OptimizedAutowireCapableBeanFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;

grails-web/src/main/groovy/org/grails/web/servlet/context/support/GrailsRuntimeConfigurator.java

@@ -28,9 +28,14 @@
 import org.apache.commons.logging.LogFactory;
 import org.codehaus.groovy.grails.commons.ClassPropertyFetcher;
 import org.codehaus.groovy.grails.commons.GrailsApplication;
-import org.codehaus.groovy.grails.commons.spring.*;
+import org.codehaus.groovy.grails.commons.spring.OptimizedAutowireCapableBeanFactory;
+import org.codehaus.groovy.grails.commons.spring.RuntimeSpringConfigUtilities;
 import org.codehaus.groovy.grails.plugins.DefaultGrailsPluginManager;
 import org.codehaus.groovy.grails.plugins.GrailsPluginManager;
+import org.grails.spring.DefaultRuntimeSpringConfiguration;
+import org.grails.spring.GrailsApplicationContext;
+import org.grails.spring.GrailsContextEvent;
+import org.grails.spring.RuntimeSpringConfiguration;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;

grails-web/src/main/groovy/org/grails/web/servlet/context/support/WebRuntimeSpringConfiguration.java

@@ -19,7 +19,7 @@
 
 import grails.web.servlet.context.GrailsWebApplicationContext;
 import org.codehaus.groovy.grails.commons.GrailsApplication;
-import org.codehaus.groovy.grails.commons.spring.DefaultRuntimeSpringConfiguration;
+import org.grails.spring.DefaultRuntimeSpringConfiguration;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;