Refactor 'org.codehaus' -> 'org.grails' for 'grails-core'

grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/commons/GrailsApplicationFactoryBean.groovy

@@ -23,9 +23,9 @@ package org.codehaus.groovy.grails.commons
  * @author Chanwit Kaewkasi
  *
  * @since 0.1
- * @deprecated Use {@link org.grails.core.support.GrailsApplicationFactoryBean} instead
+ * @deprecated Use {@link org.grails.spring.beans.factory.GrailsApplicationFactoryBean} instead
  */
 @Deprecated
-class GrailsApplicationFactoryBean extends org.grails.core.support.GrailsApplicationFactoryBean{
+class GrailsApplicationFactoryBean extends org.grails.spring.beans.factory.GrailsApplicationFactoryBean{
 
 }

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

@@ -17,7 +17,7 @@ package org.codehaus.groovy.grails.commons.spring
 
 import groovy.transform.CompileStatic
 import grails.core.GrailsApplication
-import org.codehaus.groovy.grails.plugins.GrailsPluginManager
+import grails.plugins.GrailsPluginManager
 import org.springframework.context.ApplicationContext
 
 /**

grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/plugins/AbstractGrailsPlugin.groovy

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2004-2005 the original author or authors.
+ *
+ * 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.plugins
+
+import grails.core.GrailsApplication
+import groovy.transform.CompileStatic
+
+/**
+ * @deprecated Use {@link org.grails.plugins.AbstractGrailsPlugin} instead
+ */
+@Deprecated
+@CompileStatic
+abstract class AbstractGrailsPlugin extends org.grails.plugins.AbstractGrailsPlugin{
+    AbstractGrailsPlugin(Class<?> pluginClass, GrailsApplication application) {
+        super(pluginClass, application)
+    }
+}

grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/Servlet3AsyncWebXmlProcessor.groovy → grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/plugins/AbstractGrailsPluginManager.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 SpringSource
+ * Copyright 2004-2005 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,26 +15,17 @@
  */
 package org.codehaus.groovy.grails.plugins
 
-import groovy.xml.dom.DOMCategory
+import grails.core.GrailsApplication
+import groovy.transform.CompileStatic
 
 /**
- * Enables async processing on all filters in the chain
- *
  * @author Graeme Rocher
- * @since 2.0
+ * @deprecated Use {@link org.grails.plugins.AbstractGrailsPluginManager instead}
  */
-class Servlet3AsyncWebXmlProcessor {
-    void process(xml) {
-        use(DOMCategory) {
-            def filters = xml.'filter'
-
-            for (filter in filters) {
-                if (filter.'async-supported'.length == 0) {
-                    filter.'filter-class' + {
-                        'async-supported'(true)
-                    }
-                }
-            }
-        }
+@CompileStatic
+@Deprecated
+abstract class AbstractGrailsPluginManager extends org.grails.plugins.AbstractGrailsPluginManager {
+    AbstractGrailsPluginManager(GrailsApplication application) {
+        super(application)
     }
 }

grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/plugins/DefaultGrailsPluginManager.groovy

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2004-2005 the original author or authors.
+ *
+ * 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.plugins
+
+import grails.core.GrailsApplication
+import groovy.transform.CompileStatic
+import org.springframework.core.io.Resource
+
+
+/**
+ * @deprecated Use {@link grails.plugins.DefaultGrailsPluginManager} instead
+ */
+@Deprecated
+@CompileStatic
+class DefaultGrailsPluginManager extends grails.plugins.DefaultGrailsPluginManager {
+    DefaultGrailsPluginManager(String resourcePath, GrailsApplication application) {
+        super(resourcePath, application)
+    }
+
+    DefaultGrailsPluginManager(String[] pluginResources, GrailsApplication application) {
+        super(pluginResources, application)
+    }
+
+    DefaultGrailsPluginManager(Class<?>[] plugins, GrailsApplication application) {
+        super(plugins, application)
+    }
+
+    DefaultGrailsPluginManager(Resource[] pluginFiles, GrailsApplication application) {
+        super(pluginFiles, application)
+    }
+
+    DefaultGrailsPluginManager(GrailsApplication application) {
+        super(application)
+    }
+}

grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/plugins/PluginManagerAware.groovy

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2006-2007 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.plugins
+
+/**
+ * @author Graeme Rocher
+ * @deprecated Use {@link grails.plugins.PluginManagerAware} instead
+ */
+@Deprecated
+public interface PluginManagerAware extends grails.plugins.PluginManagerAware {
+
+}

grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/plugins/web/api/CommonWebApi.groovy

@@ -1,6 +1,6 @@
 package org.codehaus.groovy.grails.plugins.web.api
 
-import org.codehaus.groovy.grails.plugins.GrailsPluginManager
+import grails.plugins.GrailsPluginManager
 
 /**
  * @deprecated Use {@link org.grails.web.api.CommonWebApi} instead

grails-core/src/main/groovy/grails/core/DefaultGrailsApplication.java

@@ -29,6 +29,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.grails.core.AbstractGrailsApplication;
 import org.grails.core.cfg.ConfigurationHelper;
 import grails.core.events.ArtefactAdditionEvent;
 import org.grails.core.artefact.*;
@@ -55,8 +56,8 @@
  * @author Steven Devijver
  * @author Graeme Rocher
  *
- * @see org.codehaus.groovy.grails.plugins.GrailsPluginManager
- * @see org.codehaus.groovy.grails.plugins.DefaultGrailsPluginManager
+ * @see grails.plugins.GrailsPluginManager
+ * @see grails.plugins.DefaultGrailsPluginManager
  * @see grails.core.ArtefactHandler
  * @see grails.core.ArtefactInfo
  * @since 0.1

grails-core/src/main/groovy/grails/core/DefaultGrailsClass.java

@@ -15,6 +15,8 @@
  */
 package grails.core;
 
+import org.grails.core.AbstractGrailsClass;
+
 /**
  * A default implementation for Grails classes that need to be registered and managed by a GrailsApplication,
  * but don't need any special handling.

grails-core/src/main/groovy/grails/core/StandaloneGrailsApplication.java

@@ -14,10 +14,7 @@
  */
 package grails.core;
 
-import grails.core.AbstractGrailsApplication;
-import grails.core.ArtefactHandler;
-import grails.core.ArtefactInfo;
-import grails.core.GrailsClass;
+import org.grails.core.AbstractGrailsApplication;
 import groovy.util.ConfigObject;
 
 import org.springframework.beans.BeansException;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.codehaus.groovy.grails.plugins;
+package grails.plugins;
 
 import grails.util.Environment;
 import groovy.lang.GroovyClassLoader;
@@ -23,6 +23,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.codehaus.groovy.control.CompilationFailedException;
 import grails.core.GrailsApplication;
+import org.codehaus.groovy.grails.plugins.GrailsPluginUtils;
+import org.grails.plugins.*;
 import org.grails.spring.DefaultRuntimeSpringConfiguration;
 import org.grails.spring.RuntimeSpringConfiguration;
 import org.grails.core.exceptions.GrailsConfigurationException;
@@ -222,7 +224,7 @@ public void informObservers(String pluginName, Map event) {
     }
 
     /* (non-Javadoc)
-     * @see org.codehaus.groovy.grails.plugins.GrailsPluginManager#loadPlugins()
+     * @see grails.plugins.GrailsPluginManager#loadPlugins()
      */
     public void loadPlugins() throws PluginException {
         if (initialised) {

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.codehaus.groovy.grails.plugins;
+package grails.plugins;
 
 import grails.util.BuildScope;
 import grails.util.Environment;
@@ -24,8 +24,9 @@
 import java.util.Map;
 
 import grails.core.GrailsApplication;
+import org.codehaus.groovy.grails.plugins.GrailsPluginInfo;
 import org.grails.spring.RuntimeSpringConfiguration;
-import org.codehaus.groovy.grails.plugins.support.WatchPattern;
+import org.grails.plugins.support.WatchPattern;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.io.Resource;
@@ -48,7 +49,7 @@
  * @see org.springframework.beans.factory.support.BeanDefinitionRegistry
  */
 @SuppressWarnings("rawtypes")
-public interface GrailsPlugin extends ApplicationContextAware, Comparable, GrailsPluginInfo {
+public interface GrailsPlugin extends ApplicationContextAware, Comparable, GrailsPluginInfo, org.codehaus.groovy.grails.plugins.GrailsPlugin {
 
     int EVENT_ON_CHANGE = 0;
     int EVENT_ON_CONFIG_CHANGE = 1;

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

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

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

@@ -1,34 +1,34 @@
-/*
- * Copyright 2004-2005 the original author or authors.
- *
- * 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.plugins;
-
-import java.util.List;
-
-/**
- * Defines interface for obtaining a sublist of <code>GrailsPlugin</code> instances
- * based on an original supplied list of <code>GrailsPlugin</code> instances.
- *
- * @author Phil Zoio
- */
-public interface PluginFilter {
-
-    /**
-     * Returns a filtered list of plugins.
-     * @param original the original supplied set of <code>GrailsPlugin</code> instances
-     * @return a sublist of these items
-     */
-    List<GrailsPlugin> filterPluginList(List<GrailsPlugin>  original);
-}
+/*
+ * Copyright 2004-2005 the original author or authors.
+ *
+ * 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 grails.plugins;
+
+import java.util.List;
+
+/**
+ * Defines interface for obtaining a sublist of <code>GrailsPlugin</code> instances
+ * based on an original supplied list of <code>GrailsPlugin</code> instances.
+ *
+ * @author Phil Zoio
+ */
+public interface PluginFilter {
+
+    /**
+     * Returns a filtered list of plugins.
+     * @param original the original supplied set of <code>GrailsPlugin</code> instances
+     * @return a sublist of these items
+     */
+    List<GrailsPlugin> filterPluginList(List<GrailsPlugin>  original);
+}

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.codehaus.groovy.grails.plugins;
+package grails.plugins;
 
 import org.springframework.beans.factory.Aware;
 

grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/PluginManagerLoader.groovy → grails-core/src/main/groovy/grails/plugins/PluginManagerLoader.groovy

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.codehaus.groovy.grails.plugins
+package grails.plugins
 
 /**
  * Interface for a class that loads plugins

grails-core/src/main/groovy/grails/util/Holders.java

@@ -27,7 +27,7 @@
 import org.apache.commons.logging.LogFactory;
 import grails.core.GrailsApplication;
 import org.grails.core.io.support.GrailsFactoriesLoader;
-import org.codehaus.groovy.grails.plugins.GrailsPluginManager;
+import grails.plugins.GrailsPluginManager;
 import org.grails.core.support.GrailsApplicationDiscoveryStrategy;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.Lifecycle;