Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Refactor 'org.codehaus.groovy.grails' -> 'org.grails'

  • Loading branch information...
commit fb4bed7317b6f8fb278cb4e9e379c9339835eb39 1 parent 2ca6ea2
@graemerocher graemerocher authored
Showing with 65 additions and 53 deletions.
  1. +1 −1  grails-plugin-async/src/main/groovy/org/grails/compiler/web/async/ControllerAsyncTransformer.java
  2. +1 −1  grails-plugin-controllers/src/main/groovy/grails/web/Controller.groovy
  3. +2 −2 ...trollers/src/main/groovy/org/{codehaus/groovy → }/grails/compiler/web/ControllerActionTransformer.java
  4. +1 −1  ...src/main/groovy/org/{codehaus/groovy → }/grails/compiler/web/ControllerArtefactTypeTransformation.java
  5. +2 −2 ...trollers/src/main/groovy/org/{codehaus/groovy → }/grails/compiler/web/ControllerDomainTransformer.java
  6. +2 −2 ...in-controllers/src/main/groovy/org/{codehaus/groovy → }/grails/compiler/web/ControllerTransformer.java
  7. +1 −1  ...trollers/src/main/groovy/org/{codehaus/groovy/grails/web → grails}/plugins/support/WebMetaUtils.groovy
  8. +1 −1  .../org/{codehaus/groovy/grails → grails/plugins}/web/controllers/ControllerExceptionHandlerMetaData.java
  9. +3 −3 ...g/{codehaus/groovy/grails/plugins/web → grails/plugins/web/controllers}/ControllersGrailsPlugin.groovy
  10. +1 −1  ...ehaus/groovy/grails → grails/plugins}/web/controllers/DefaultControllerExceptionHandlerMetaData.groovy
  11. +9 −5 ...oovy/org/{codehaus/groovy/grails/plugins/web → grails/plugins/web/controllers}/api/ControllersApi.java
  12. +1 −1  ...ehaus/groovy/grails/plugins/web → grails/plugins/web/controllers}/api/ControllersDomainBindingApi.java
  13. +1 −1  .../groovy/org/{codehaus/groovy/grails/web → grails/plugins/web/controllers}/metaclass/ChainMethod.groovy
  14. +1 −1  ...roovy/org/{codehaus/groovy/grails/web → grails/plugins/web/controllers}/metaclass/ForwardMethod.groovy
  15. +1 −1  ...y/org/{codehaus/groovy/grails/web → grails/plugins/web/controllers}/metaclass/RenderDynamicMethod.java
  16. +1 −1  ...oovy/org/{codehaus/groovy/grails/web → grails/plugins/web/controllers}/metaclass/WithFormMethod.groovy
  17. +1 −1  grails-plugin-controllers/src/main/resources/META-INF/grails-plugin.xml
  18. +3 −1 ...roovy/org/codehaus/groovy/grails/compiler/web/ControllerActionTransformerClosureActionOverridingSpec.groovy
  19. +2 −1  ...test/groovy/org/codehaus/groovy/grails/compiler/web/ControllerActionTransformerCompilationErrorsSpec.groovy
  20. +2 −0  ...-controllers/src/test/groovy/org/codehaus/groovy/grails/compiler/web/ControllerActionTransformerSpec.groovy
  21. +2 −1  ...-controllers/src/test/groovy/org/codehaus/groovy/grails/compiler/web/ControllerDomainTransformerSpec.groovy
  22. +1 −0  ...plugin-controllers/src/test/groovy/org/codehaus/groovy/grails/compiler/web/ControllerTransformerSpec.groovy
  23. +1 −1  grails-plugin-filters/src/main/groovy/org/codehaus/groovy/grails/plugins/web/filters/CompositeInterceptor.java
  24. +1 −1  grails-plugin-filters/src/main/groovy/org/codehaus/groovy/grails/plugins/web/filters/FilterConfig.groovy
  25. +1 −1  ...s-plugin-rest/src/main/groovy/org/codehaus/groovy/grails/compiler/web/rest/ControllerRestTransformer.groovy
  26. +1 −1  grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/api/ControllersRestApi.groovy
  27. +1 −1  grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/transform/ResourceTransform.groovy
  28. +1 −1  grails-plugin-testing/src/main/groovy/grails/test/mixin/domain/DomainClassUnitTestMixin.groovy
  29. +2 −2 grails-plugin-testing/src/main/groovy/grails/test/mixin/web/ControllerUnitTestMixin.groovy
  30. +1 −1  grails-plugin-testing/src/main/groovy/grails/test/runtime/ControllerTestPlugin.groovy
  31. +1 −1  ...-suite-base/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/AbstractGrailsControllerTests.groovy
  32. +1 −1  grails-test-suite-base/src/main/groovy/org/codehaus/groovy/grails/web/taglib/AbstractGrailsTagTests.groovy
  33. +1 −1  grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/orm/GormSpec.groovy
  34. +1 −1  ...-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/commons/metaclass/MetaClassEnhancerTests.groovy
  35. +2 −4 ...-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/plugins/web/ControllersGrailsPluginTests.groovy
  36. +3 −1 grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/web/metaclass/ForwardMethodspec.groovy
  37. +1 −0  grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/web/metaclass/WithFormMethodTests.groovy
  38. +1 −1  ...suite-uber/src/test/groovy/org/codehaus/groovy/grails/web/servlet/mvc/ControllersDynamicMethodsTests.groovy
  39. +1 −1  grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/web/servlet/mvc/RedirectMethodTests.groovy
  40. +1 −1  grails-test-suite-uber/src/test/groovy/org/grails/validation/ConstrainedPropertyBuilderForCommandsTests.groovy
  41. +1 −1  ...st-suite-web/src/test/groovy/org/codehaus/groovy/grails/plugins/web/filters/FiltersGrailsPluginTests.groovy
  42. +1 −1  ...st/groovy/org/codehaus/groovy/grails/web/controllers/ControllerExceptionHandlerCompilationErrorsSpec.groovy
  43. +1 −1  ...src/test/groovy/org/codehaus/groovy/grails/web/controllers/ControllerExceptionHandlerInheritanceSpec.groovy
View
2  grails-plugin-async/src/main/groovy/org/grails/compiler/web/async/ControllerAsyncTransformer.java
@@ -18,7 +18,7 @@
import org.grails.core.artefact.ControllerArtefactHandler;
import org.grails.compiler.injection.AbstractGrailsArtefactTransformer;
import grails.compiler.ast.AstTransformer;
-import org.codehaus.groovy.grails.compiler.web.ControllerTransformer;
+import org.grails.compiler.web.ControllerTransformer;
import org.grails.plugins.web.async.api.ControllersAsyncApi;
import java.net.URL;
View
2  grails-plugin-controllers/src/main/groovy/grails/web/Controller.groovy
@@ -12,6 +12,6 @@ import java.lang.annotation.Target
*/
@Retention(RetentionPolicy.RUNTIME)
@Target( [ ElementType.TYPE ] )
-@GroovyASTTransformationClass("org.codehaus.groovy.grails.compiler.web.ControllerArtefactTypeTransformation")
+@GroovyASTTransformationClass("org.grails.compiler.web.ControllerArtefactTypeTransformation")
public @interface Controller {
}
View
4 ...ils/compiler/web/ControllerActionTransformer.java → ...ils/compiler/web/ControllerActionTransformer.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.compiler.web;
+package org.grails.compiler.web;
import static org.grails.compiler.injection.GrailsASTUtils.applyDefaultMethodTarget;
import static org.grails.compiler.injection.GrailsASTUtils.applyMethodTarget;
@@ -86,7 +86,7 @@
import grails.compiler.ast.AstTransformer;
import org.grails.compiler.injection.GrailsASTUtils;
import grails.compiler.ast.GrailsArtefactClassInjector;
-import org.codehaus.groovy.grails.web.controllers.DefaultControllerExceptionHandlerMetaData;
+import org.grails.plugins.web.controllers.DefaultControllerExceptionHandlerMetaData;
import grails.web.util.TypeConvertingMap;
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import org.codehaus.groovy.syntax.Token;
View
2  ...ler/web/ControllerArtefactTypeTransformation.java → ...ler/web/ControllerArtefactTypeTransformation.java
@@ -1,4 +1,4 @@
-package org.codehaus.groovy.grails.compiler.web;
+package org.grails.compiler.web;
import grails.web.Controller;
import org.codehaus.groovy.ast.AnnotationNode;
View
4 ...ils/compiler/web/ControllerDomainTransformer.java → ...ils/compiler/web/ControllerDomainTransformer.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.compiler.web;
+package org.grails.compiler.web;
import java.net.URL;
@@ -25,7 +25,7 @@
import org.grails.compiler.injection.AbstractGrailsArtefactTransformer;
import grails.compiler.ast.AstTransformer;
import org.codehaus.groovy.grails.io.support.GrailsResourceUtils;
-import org.codehaus.groovy.grails.plugins.web.api.ControllersDomainBindingApi;
+import org.grails.plugins.web.controllers.api.ControllersDomainBindingApi;
import org.grails.web.databinding.DefaultASTDatabindingHelper;
/**
View
4 ...vy/grails/compiler/web/ControllerTransformer.java → ...rg/grails/compiler/web/ControllerTransformer.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.compiler.web;
+package org.grails.compiler.web;
import java.net.URL;
import java.util.List;
@@ -30,7 +30,7 @@
import grails.compiler.ast.AstTransformer;
import org.grails.compiler.injection.GrailsASTUtils;
import org.codehaus.groovy.grails.io.support.GrailsResourceUtils;
-import org.codehaus.groovy.grails.plugins.web.api.ControllersApi;
+import org.grails.plugins.web.controllers.api.ControllersApi;
/**
* Enhances controller classes with the appropriate API at compile time.
View
2  ...vy/grails/web/plugins/support/WebMetaUtils.groovy → ...vy/org/grails/plugins/support/WebMetaUtils.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.web.plugins.support
+package org.grails.plugins.support
import grails.databinding.DataBindingSource;
import grails.databinding.SimpleMapDataBindingSource;
View
2  ...ntrollers/ControllerExceptionHandlerMetaData.java → ...ntrollers/ControllerExceptionHandlerMetaData.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.web.controllers;
+package org.grails.plugins.web.controllers;
/**
* Represents meta data which describes an exception handling method
View
6 ...grails/plugins/web/ControllersGrailsPlugin.groovy → ...ns/web/controllers/ControllersGrailsPlugin.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.plugins.web
+package org.grails.plugins.web.controllers
import grails.artefact.Enhanced
import grails.config.Settings
@@ -28,8 +28,8 @@ import grails.core.GrailsApplication
import grails.core.GrailsClass
import org.grails.core.metaclass.MetaClassEnhancer
import grails.core.support.GrailsApplicationAware
-import org.codehaus.groovy.grails.plugins.web.api.ControllersApi
-import org.codehaus.groovy.grails.plugins.web.api.ControllersDomainBindingApi
+import org.grails.plugins.web.controllers.api.ControllersApi
+import org.grails.plugins.web.controllers.api.ControllersDomainBindingApi
import org.grails.web.errors.GrailsExceptionResolver
import org.grails.web.filters.HiddenHttpMethodFilter
import org.grails.web.mapping.mvc.UrlMappingsInfoHandlerAdapter
View
2  .../DefaultControllerExceptionHandlerMetaData.groovy → .../DefaultControllerExceptionHandlerMetaData.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.web.controllers;
+package org.grails.plugins.web.controllers;
import groovy.transform.Immutable
View
14 ...groovy/grails/plugins/web/api/ControllersApi.java → ...s/plugins/web/controllers/api/ControllersApi.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.web.api;
+package org.grails.plugins.web.controllers.api;
import grails.async.Promise;
import grails.converters.JSON;
@@ -63,19 +63,23 @@
import grails.core.GrailsDomainClassProperty;
-import org.codehaus.groovy.grails.compiler.web.ControllerActionTransformer;
+import org.grails.compiler.web.ControllerActionTransformer;
import grails.plugins.GrailsPluginManager;
import grails.web.databinding.DataBindingUtils;
-import org.codehaus.groovy.grails.web.controllers.ControllerExceptionHandlerMetaData;
+import org.grails.plugins.web.controllers.ControllerExceptionHandlerMetaData;
import grails.web.mapping.LinkGenerator;
-import org.codehaus.groovy.grails.web.plugins.support.WebMetaUtils;
+import org.grails.plugins.support.WebMetaUtils;
import grails.web.util.GrailsApplicationAttributes;
+import org.grails.plugins.web.controllers.metaclass.ChainMethod;
+import org.grails.plugins.web.controllers.metaclass.ForwardMethod;
+import org.grails.plugins.web.controllers.metaclass.RenderDynamicMethod;
+import org.grails.plugins.web.controllers.metaclass.WithFormMethod;
import org.grails.web.servlet.mvc.ActionResultTransformer;
import org.grails.web.servlet.mvc.GrailsWebRequest;
@@ -100,7 +104,7 @@
import org.springframework.web.servlet.View;
import org.springframework.web.servlet.support.RequestDataValueProcessor;
-import static org.codehaus.groovy.grails.web.metaclass.RenderDynamicMethod.*;
+import static org.grails.plugins.web.controllers.metaclass.RenderDynamicMethod.*;
/**
* API for each controller in a Grails application.
*
View
2  .../plugins/web/api/ControllersDomainBindingApi.java → .../controllers/api/ControllersDomainBindingApi.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.web.api;
+package org.grails.plugins.web.controllers.api;
import java.util.Map;
View
2  ...us/groovy/grails/web/metaclass/ChainMethod.groovy → ...gins/web/controllers/metaclass/ChainMethod.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.web.metaclass
+package org.grails.plugins.web.controllers.metaclass
import grails.util.GrailsNameUtils
View
2  .../groovy/grails/web/metaclass/ForwardMethod.groovy → ...ns/web/controllers/metaclass/ForwardMethod.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.web.metaclass
+package org.grails.plugins.web.controllers.metaclass
import grails.web.UrlConverter
import groovy.transform.CompileStatic
View
2  ...ovy/grails/web/metaclass/RenderDynamicMethod.java → ...eb/controllers/metaclass/RenderDynamicMethod.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.web.metaclass;
+package org.grails.plugins.web.controllers.metaclass;
/**
* Allows rendering of text, views, and templates to the response
View
2  ...groovy/grails/web/metaclass/WithFormMethod.groovy → ...s/web/controllers/metaclass/WithFormMethod.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.web.metaclass
+package org.grails.plugins.web.controllers.metaclass
import org.grails.web.servlet.mvc.AbstractTokenResponseHandler
import org.grails.web.servlet.mvc.GrailsWebRequest
View
2  grails-plugin-controllers/src/main/resources/META-INF/grails-plugin.xml
@@ -1,3 +1,3 @@
<plugin name='controllers'>
- <type>org.codehaus.groovy.grails.plugins.web.ControllersGrailsPlugin</type>
+ <type>org.grails.plugins.web.controllers.ControllersGrailsPlugin</type>
</plugin>
View
4 ...vy/org/codehaus/groovy/grails/compiler/web/ControllerActionTransformerClosureActionOverridingSpec.groovy
@@ -4,7 +4,9 @@ import grails.util.GrailsWebUtil
import grails.compiler.ast.ClassInjector
import org.grails.compiler.injection.GrailsAwareClassLoader
-import org.codehaus.groovy.grails.plugins.web.api.ControllersApi
+import org.grails.plugins.web.controllers.api.ControllersApi
+import org.grails.compiler.web.ControllerActionTransformer
+import org.grails.compiler.web.ControllerTransformer
import org.springframework.web.context.request.RequestContextHolder
import spock.lang.Specification
View
3  ...t/groovy/org/codehaus/groovy/grails/compiler/web/ControllerActionTransformerCompilationErrorsSpec.groovy
@@ -3,7 +3,8 @@ package org.codehaus.groovy.grails.compiler.web
import org.codehaus.groovy.control.MultipleCompilationErrorsException
import grails.compiler.ast.ClassInjector
import org.grails.compiler.injection.GrailsAwareClassLoader
-
+import org.grails.compiler.web.ControllerActionTransformer
+import org.grails.compiler.web.ControllerTransformer
import spock.lang.Specification
class ControllerActionTransformerCompilationErrorsSpec extends Specification {
View
2  ...ntrollers/src/test/groovy/org/codehaus/groovy/grails/compiler/web/ControllerActionTransformerSpec.groovy
@@ -3,6 +3,8 @@ package org.codehaus.groovy.grails.compiler.web
import grails.util.BuildSettings
import grails.util.GrailsWebUtil
import grails.web.Action
+import org.grails.compiler.web.ControllerActionTransformer
+import org.grails.compiler.web.ControllerTransformer
import java.lang.reflect.Modifier
View
3  ...ntrollers/src/test/groovy/org/codehaus/groovy/grails/compiler/web/ControllerDomainTransformerSpec.groovy
@@ -4,12 +4,13 @@ import grails.spring.WebBeanBuilder
import grails.util.GrailsWebUtil
import grails.core.DefaultGrailsApplication
+import org.grails.compiler.web.ControllerDomainTransformer
import org.grails.core.artefact.DomainClassArtefactHandler
import grails.core.GrailsApplication
import org.grails.core.metaclass.MetaClassEnhancer
import grails.compiler.ast.ClassInjector
import org.grails.compiler.injection.GrailsAwareClassLoader
-import org.codehaus.groovy.grails.plugins.web.api.ControllersDomainBindingApi
+import org.grails.plugins.web.controllers.api.ControllersDomainBindingApi
import org.grails.web.servlet.mvc.GrailsWebRequest
import org.springframework.web.context.WebApplicationContext
import org.springframework.web.context.request.RequestContextHolder
View
1  ...gin-controllers/src/test/groovy/org/codehaus/groovy/grails/compiler/web/ControllerTransformerSpec.groovy
@@ -1,6 +1,7 @@
package org.codehaus.groovy.grails.compiler.web
import grails.util.GrailsWebUtil
+import org.grails.compiler.web.ControllerTransformer
import javax.servlet.http.HttpServletRequest
View
2  ...-plugin-filters/src/main/groovy/org/codehaus/groovy/grails/plugins/web/filters/CompositeInterceptor.java
@@ -22,7 +22,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.codehaus.groovy.grails.web.metaclass.ForwardMethod;
+import org.grails.plugins.web.controllers.metaclass.ForwardMethod;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.servlet.HandlerInterceptor;
View
2  grails-plugin-filters/src/main/groovy/org/codehaus/groovy/grails/plugins/web/filters/FilterConfig.groovy
@@ -22,7 +22,7 @@ import javax.servlet.http.HttpSession
import grails.core.GrailsApplication
import grails.util.GrailsClassUtils
-import org.codehaus.groovy.grails.plugins.web.api.ControllersApi
+import org.grails.plugins.web.controllers.api.ControllersApi
import grails.web.mvc.FlashScope
import grails.web.util.GrailsApplicationAttributes
import grails.web.servlet.mvc.GrailsParameterMap
View
2  ...lugin-rest/src/main/groovy/org/codehaus/groovy/grails/compiler/web/rest/ControllerRestTransformer.groovy
@@ -22,7 +22,7 @@ import org.codehaus.groovy.ast.ClassNode
import org.grails.core.artefact.ControllerArtefactHandler
import org.grails.compiler.injection.AbstractGrailsArtefactTransformer
import grails.compiler.ast.AstTransformer
-import org.codehaus.groovy.grails.compiler.web.ControllerTransformer
+import org.grails.compiler.web.ControllerTransformer
import org.grails.plugins.web.rest.api.ControllersRestApi
/**
View
2  grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/api/ControllersRestApi.groovy
@@ -26,7 +26,7 @@ import org.springframework.util.Assert
import javax.servlet.http.HttpServletResponse
import grails.core.GrailsDomainClassProperty
-import org.codehaus.groovy.grails.plugins.web.api.ControllersApi
+import org.grails.plugins.web.controllers.api.ControllersApi
import org.grails.plugins.web.api.ControllersMimeTypesApi
import grails.core.support.proxy.ProxyHandler
import grails.web.mime.MimeType
View
2  grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/transform/ResourceTransform.groovy
@@ -62,7 +62,7 @@ import org.grails.core.artefact.ControllerArtefactHandler
import org.grails.compiler.injection.ArtefactTypeAstTransformation
import grails.compiler.ast.ClassInjector
import org.grails.compiler.injection.GrailsAwareInjectionOperation
-import org.codehaus.groovy.grails.compiler.web.ControllerActionTransformer
+import org.grails.compiler.web.ControllerActionTransformer
import org.grails.core.io.DefaultResourceLocator
import org.grails.core.io.ResourceLocator
import org.grails.transaction.transform.TransactionalTransform
View
2  grails-plugin-testing/src/main/groovy/grails/test/mixin/domain/DomainClassUnitTestMixin.groovy
@@ -23,7 +23,7 @@ import org.grails.core.artefact.DomainClassArtefactHandler
import grails.util.GrailsClassUtils
import grails.core.GrailsDomainClass
import org.codehaus.groovy.grails.plugins.DomainClassGrailsPlugin
-import org.codehaus.groovy.grails.plugins.web.ControllersGrailsPlugin
+import org.grails.plugins.web.controllers.ControllersGrailsPlugin
import org.grails.validation.ConstraintEvalUtils
import org.grails.datastore.gorm.GormEnhancer
import org.grails.datastore.mapping.model.PersistentEntity
View
4 grails-plugin-testing/src/main/groovy/grails/test/mixin/web/ControllerUnitTestMixin.groovy
@@ -29,11 +29,11 @@ import org.grails.plugins.converters.api.ConvertersControllersApi
import org.codehaus.groovy.grails.plugins.testing.GrailsMockHttpServletRequest
import org.codehaus.groovy.grails.plugins.testing.GrailsMockHttpServletResponse
import org.codehaus.groovy.grails.plugins.web.api.ControllerTagLibraryApi
-import org.codehaus.groovy.grails.plugins.web.api.ControllersApi
+import org.grails.plugins.web.controllers.api.ControllersApi
import org.grails.plugins.web.api.ControllersMimeTypesApi
import grails.web.mime.MimeType
import org.codehaus.groovy.grails.web.pages.GroovyPageUtils
-import org.codehaus.groovy.grails.web.plugins.support.WebMetaUtils
+import org.grails.plugins.support.WebMetaUtils
import grails.web.mvc.FlashScope
import grails.web.util.GrailsApplicationAttributes
import grails.web.servlet.mvc.GrailsParameterMap
View
2  grails-plugin-testing/src/main/groovy/grails/test/runtime/ControllerTestPlugin.groovy
@@ -37,7 +37,7 @@ import org.grails.plugins.converters.ConvertersPluginSupport
import org.codehaus.groovy.grails.plugins.testing.GrailsMockHttpServletRequest
import org.codehaus.groovy.grails.plugins.testing.GrailsMockHttpServletResponse
import org.codehaus.groovy.grails.plugins.web.api.ControllerTagLibraryApi
-import org.codehaus.groovy.grails.plugins.web.api.ControllersApi
+import org.grails.plugins.web.controllers.api.ControllersApi
import org.grails.plugins.web.ServletsGrailsPluginSupport;
import org.grails.plugins.web.api.ControllersMimeTypesApi
import org.grails.plugins.web.api.RequestMimeTypesApi
View
2  ...ite-base/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/AbstractGrailsControllerTests.groovy
@@ -98,7 +98,7 @@ abstract class AbstractGrailsControllerTests extends GroovyTestCase {
"org.grails.plugins.i18n.I18nGrailsPlugin",
"org.grails.plugins.web.ServletsGrailsPlugin",
"org.grails.plugins.web.mapping.UrlMappingsGrailsPlugin",
- "org.codehaus.groovy.grails.plugins.web.ControllersGrailsPlugin",
+ "org.grails.plugins.web.controllers.ControllersGrailsPlugin",
"org.codehaus.groovy.grails.plugins.web.GroovyPagesGrailsPlugin",
"org.grails.plugins.web.mime.MimeTypesGrailsPlugin",
"org.codehaus.groovy.grails.plugins.web.filters.FiltersGrailsPlugin",
View
2  grails-test-suite-base/src/main/groovy/org/codehaus/groovy/grails/web/taglib/AbstractGrailsTagTests.groovy
@@ -248,7 +248,7 @@ abstract class AbstractGrailsTagTests extends GroovyTestCase {
dependantPluginClasses << gcl.loadClass("org.grails.plugins.i18n.I18nGrailsPlugin")
dependantPluginClasses << gcl.loadClass("org.grails.plugins.web.ServletsGrailsPlugin")
dependantPluginClasses << gcl.loadClass("org.grails.plugins.web.mapping.UrlMappingsGrailsPlugin")
- dependantPluginClasses << gcl.loadClass("org.codehaus.groovy.grails.plugins.web.ControllersGrailsPlugin")
+ dependantPluginClasses << gcl.loadClass("org.grails.plugins.web.controllers.ControllersGrailsPlugin")
dependantPluginClasses << gcl.loadClass("org.codehaus.groovy.grails.plugins.web.GroovyPagesGrailsPlugin")
dependantPluginClasses << gcl.loadClass("org.codehaus.groovy.grails.plugins.log4j.LoggingGrailsPlugin")
View
2  grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/orm/GormSpec.groovy
@@ -152,7 +152,7 @@ abstract class GormSpec extends Specification {
dependantPluginClasses << gcl.loadClass("org.codehaus.groovy.grails.plugins.i18n.I18nGrailsPlugin")
dependantPluginClasses << gcl.loadClass("org.grails.plugins.web.ServletsGrailsPlugin")
dependantPluginClasses << gcl.loadClass("org.grails.plugins.web.mapping.UrlMappingsGrailsPlugin")
- dependantPluginClasses << gcl.loadClass("org.codehaus.groovy.grails.plugins.web.ControllersGrailsPlugin")
+ dependantPluginClasses << gcl.loadClass("org.grails.plugins.web.controllers.ControllersGrailsPlugin")
dependantPluginClasses << gcl.loadClass("org.codehaus.groovy.grails.plugins.web.GroovyPagesGrailsPlugin")
dependantPluginClasses << gcl.loadClass("org.grails.plugins.web.mime.MimeTypesGrailsPlugin")
dependantPluginClasses << gcl.loadClass("org.codehaus.groovy.grails.plugins.web.filters.FiltersGrailsPlugin")
View
2  ...st-suite-uber/src/test/groovy/org/codehaus/groovy/grails/commons/metaclass/MetaClassEnhancerTests.groovy
@@ -5,7 +5,7 @@ import grails.util.GrailsWebUtil
import grails.core.DefaultGrailsApplication
import grails.core.GrailsApplication
import org.grails.plugins.MockGrailsPluginManager
-import org.codehaus.groovy.grails.plugins.web.api.ControllersApi
+import org.grails.plugins.web.controllers.api.ControllersApi
import org.codehaus.groovy.grails.support.MockApplicationContext
import org.grails.core.metaclass.MetaClassEnhancer
import org.grails.web.mapping.DefaultUrlMappingsHolder
View
6 ...st-suite-uber/src/test/groovy/org/codehaus/groovy/grails/plugins/web/ControllersGrailsPluginTests.groovy
@@ -3,9 +3,7 @@ package org.codehaus.groovy.grails.plugins.web
import grails.core.DefaultGrailsApplication
import grails.spring.BeanBuilder
import grails.util.GrailsWebUtil
-import grails.core.GrailsApplication
-import org.springframework.beans.factory.NoSuchBeanDefinitionException
-import org.springframework.web.multipart.commons.CommonsMultipartResolver
+import org.grails.plugins.web.controllers.ControllersGrailsPlugin
class ControllersGrailsPluginTests extends AbstractGrailsPluginTests {
@@ -60,7 +58,7 @@ class FormTagLib {
pluginsToLoad << gcl.loadClass("org.grails.plugins.CoreGrailsPlugin")
pluginsToLoad << gcl.loadClass("org.grails.plugins.i18n.I18nGrailsPlugin")
- pluginsToLoad << gcl.loadClass("org.codehaus.groovy.grails.plugins.web.ControllersGrailsPlugin")
+ pluginsToLoad << gcl.loadClass("org.grails.plugins.web.controllers.ControllersGrailsPlugin")
pluginsToLoad << gcl.loadClass("org.codehaus.groovy.grails.plugins.web.GroovyPagesGrailsPlugin")
pluginsToLoad << gcl.loadClass("org.grails.plugins.web.mapping.UrlMappingsGrailsPlugin")
}
View
4 grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/web/metaclass/ForwardMethodspec.groovy
@@ -1,5 +1,7 @@
package org.codehaus.groovy.grails.web.metaclass
-
+
+import org.grails.plugins.web.controllers.metaclass.ForwardMethod
+
import javax.servlet.RequestDispatcher
import javax.servlet.ServletContext
import javax.servlet.http.HttpServletRequest
View
1  grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/web/metaclass/WithFormMethodTests.groovy
@@ -18,6 +18,7 @@ package org.codehaus.groovy.grails.web.metaclass
import grails.util.GrailsWebUtil
import org.grails.core.exceptions.GrailsRuntimeException
+import org.grails.plugins.web.controllers.metaclass.WithFormMethod
import org.grails.web.servlet.mvc.SynchronizerTokensHolder
import org.springframework.web.context.request.RequestContextHolder
View
2  ...te-uber/src/test/groovy/org/codehaus/groovy/grails/web/servlet/mvc/ControllersDynamicMethodsTests.groovy
@@ -39,7 +39,7 @@ class ControllersDynamicMethodsTests extends AbstractGrailsMockTests {
dependantPluginClasses << gcl.loadClass("org.grails.plugins.web.ServletsGrailsPlugin")
dependantPluginClasses << gcl.loadClass("org.grails.plugins.web.mapping.UrlMappingsGrailsPlugin")
- dependantPluginClasses << gcl.loadClass("org.codehaus.groovy.grails.plugins.web.ControllersGrailsPlugin")
+ dependantPluginClasses << gcl.loadClass("org.grails.plugins.web.controllers.ControllersGrailsPlugin")
def dependentPlugins = dependantPluginClasses.collect { new DefaultGrailsPlugin(it, ga)}
def springConfig = new WebRuntimeSpringConfiguration(ctx)
View
2  ...ls-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/web/servlet/mvc/RedirectMethodTests.groovy
@@ -2,7 +2,7 @@ package org.codehaus.groovy.grails.web.servlet.mvc
import grails.util.MockRequestDataValueProcessor
import grails.web.mapping.mvc.RedirectEventListener
-import org.codehaus.groovy.grails.plugins.web.api.ControllersApi
+import org.grails.plugins.web.controllers.api.ControllersApi
import org.codehaus.groovy.grails.support.MockApplicationContext
import grails.web.util.GrailsApplicationAttributes
import grails.web.http.HttpHeaders
View
2  ...-test-suite-uber/src/test/groovy/org/grails/validation/ConstrainedPropertyBuilderForCommandsTests.groovy
@@ -1,7 +1,7 @@
package org.grails.validation
import org.codehaus.groovy.grails.web.servlet.mvc.AbstractGrailsControllerTests
-import org.codehaus.groovy.grails.web.plugins.support.WebMetaUtils
+import org.grails.plugins.support.WebMetaUtils
/**
* Tests constraints building specific for command objects
View
2  ...suite-web/src/test/groovy/org/codehaus/groovy/grails/plugins/web/filters/FiltersGrailsPluginTests.groovy
@@ -2,7 +2,7 @@ package org.codehaus.groovy.grails.plugins.web.filters
import org.codehaus.groovy.grails.plugins.web.AbstractGrailsPluginTests
import grails.plugins.GrailsPlugin
-import org.codehaus.groovy.grails.plugins.web.ControllersGrailsPlugin
+import org.grails.plugins.web.controllers.ControllersGrailsPlugin
import org.grails.plugins.web.mapping.UrlMappingsGrailsPlugin
/**
View
2  ...groovy/org/codehaus/groovy/grails/web/controllers/ControllerExceptionHandlerCompilationErrorsSpec.groovy
@@ -3,7 +3,7 @@ package org.codehaus.groovy.grails.web.controllers
import org.codehaus.groovy.control.MultipleCompilationErrorsException
import grails.compiler.ast.ClassInjector
import org.grails.compiler.injection.GrailsAwareClassLoader
-import org.codehaus.groovy.grails.compiler.web.ControllerActionTransformer
+import org.grails.compiler.web.ControllerActionTransformer
import spock.lang.Specification
View
2  .../test/groovy/org/codehaus/groovy/grails/web/controllers/ControllerExceptionHandlerInheritanceSpec.groovy
@@ -6,7 +6,7 @@ import grails.test.mixin.TestFor
import java.sql.BatchUpdateException
import java.sql.SQLException
-import org.codehaus.groovy.grails.compiler.web.ControllerActionTransformer
+import org.grails.compiler.web.ControllerActionTransformer
import spock.lang.Specification
Please sign in to comment.
Something went wrong with that request. Please try again.