Merge branch '3.1.x' into 3.2.x

Author: jeffscottbrown

build.gradle

@@ -472,7 +472,7 @@ subprojects { project ->
         }
 
     }
-    compileGroovy.dependsOn processResources
+
 }
 
 

grails-core/src/main/groovy/org/grails/compiler/injection/EnhancesTraitTransformation.groovy

@@ -86,8 +86,8 @@ class EnhancesTraitTransformation extends AbstractArtefactTypeAstTransformation
 
             ast.classes.add transformerNode
 
-            def resourcesTargetDirectory = GlobalGrailsClassInjectorTransformation.resolveResourcesTargetDirectory(source)
-            GlobalGrailsClassInjectorTransformation.updateGrailsFactoriesWithType(transformerNode, GlobalGrailsClassInjectorTransformation.TRAIT_INJECTOR_CLASS, resourcesTargetDirectory)
+            def compilationTargetDirectory = GlobalGrailsClassInjectorTransformation.resolveCompilationTargetDirectory(source)
+            GlobalGrailsClassInjectorTransformation.updateGrailsFactoriesWithType(transformerNode, GlobalGrailsClassInjectorTransformation.TRAIT_INJECTOR_CLASS, compilationTargetDirectory)
 
         }
 

grails-core/src/main/groovy/org/grails/compiler/injection/GlobalGrailsClassInjectorTransformation.groovy

@@ -5,7 +5,6 @@ import grails.compiler.ast.ClassInjector
 import grails.core.ArtefactHandler
 import grails.io.IOUtils
 import grails.plugins.metadata.GrailsPlugin
-import grails.util.BuildSettings
 import grails.util.GrailsNameUtils
 import groovy.transform.CompilationUnitAware
 import groovy.transform.CompileDynamic
@@ -65,7 +64,7 @@ class GlobalGrailsClassInjectorTransformation implements ASTTransformation, Comp
         Set<String> transformedClasses = []
         String pluginVersion = null
         ClassNode pluginClassNode = null
-        def compilationTargetDirectory = resolveResourcesTargetDirectory(source)
+        def compilationTargetDirectory = resolveCompilationTargetDirectory(source)
         def pluginXmlFile = new File(compilationTargetDirectory, "META-INF/grails-plugin.xml")
 
         for (ClassNode classNode : classes) {
@@ -143,10 +142,6 @@ class GlobalGrailsClassInjectorTransformation implements ASTTransformation, Comp
         generatePluginXml(pluginClassNode, pluginVersion, transformedClasses, pluginXmlFile)
     }
 
-    static File resolveResourcesTargetDirectory(SourceUnit source) {
-        BuildSettings.RESOURCES_DIR ?: new File(resolveCompilationTargetDirectory(source), '../../resources/main/')
-    }
-
     static File resolveCompilationTargetDirectory(SourceUnit source) {
         File targetDirectory = source.configuration.targetDirectory
         if(targetDirectory==null && source.getClass().name == 'org.codehaus.jdt.groovy.control.EclipseSourceUnit') {
@@ -155,14 +150,13 @@ class GlobalGrailsClassInjectorTransformation implements ASTTransformation, Comp
         return targetDirectory
     }
 
-    static boolean updateGrailsFactoriesWithType(ClassNode classNode, ClassNode superType, File targetDirectory) {
+    static boolean updateGrailsFactoriesWithType(ClassNode classNode, ClassNode superType, File compilationTargetDirectory) {
         if (GrailsASTUtils.isSubclassOfOrImplementsInterface(classNode, superType)) {
             if(Modifier.isAbstract(classNode.getModifiers())) return false
 
             def classNodeName = classNode.name
             // generate META-INF/grails.factories
-
-            def factoriesFile = new File(targetDirectory, "META-INF/grails.factories")
+            def factoriesFile = new File(compilationTargetDirectory, "META-INF/grails.factories")
             factoriesFile.parentFile.mkdirs()
             def props = new Properties()
             def superTypeName = superType.getName()

grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy

@@ -127,8 +127,6 @@ class GrailsGradlePlugin extends GroovyPlugin {
         configureRunCommand(project)
 
         configurePathingJar(project)
-
-        configureResourceProcessing(project)
     }
 
     protected void configureProfile(Project project) {
@@ -233,14 +231,6 @@ class GrailsGradlePlugin extends GroovyPlugin {
         System.setProperty(BuildSettings.APP_BASE_DIR, project.projectDir.absolutePath)
     }
 
-    protected void configureResourceProcessing(Project project) {
-        def tasks = project.tasks
-        def resourcesTask = tasks.findByName('processResources')
-        if (resourcesTask) {
-            tasks.findByName('compileGroovy')?.dependsOn resourcesTask
-        }
-    }
-
     protected void configureApplicationCommands(Project project) {
         def applicationContextCommands = FactoriesLoaderSupport.loadFactoryNames(APPLICATION_CONTEXT_COMMAND_CLASS)
         for (ctxCommand in applicationContextCommands) {

grails-plugin-async/src/main/groovy/grails/artefact/AsyncController.groovy

@@ -37,7 +37,6 @@ import org.springframework.web.context.request.RequestContextHolder
  *
  */
 @CompileStatic
-@Enhances('Controller')
 trait AsyncController extends Events {
 
     /**

grails-plugin-async/src/main/groovy/grails/compiler/traits/AsyncControllerTraitInjector.groovy

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2014 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.compiler.traits
+
+import grails.artefact.AsyncController
+
+/**
+ * 
+ * @author Jeff Brown
+ * @since 3.0
+ *
+ */
+class AsyncControllerTraitInjector extends ControllerTraitInjector {
+    
+    @Override
+    Class getTrait() {
+        AsyncController
+    }
+
+}

grails-plugin-async/src/main/resources/META-INF/grails.factories

@@ -0,0 +1 @@
+grails.compiler.traits.TraitInjector=grails.compiler.traits.AsyncControllerTraitInjector

grails-plugin-controllers/src/main/groovy/grails/artefact/Controller.groovy

@@ -66,7 +66,6 @@ import java.lang.reflect.Method
  *
  */
 @CompileStatic
-@Enhances('Controller')
 trait Controller implements ResponseRenderer, ResponseRedirector, RequestForwarder, DataBinder, WebAttributes, ServletAttributes {
 
     private MimeTypesApiSupport mimeTypesSupport = new MimeTypesApiSupport()

grails-plugin-controllers/src/main/groovy/grails/compiler/traits/ControllerTraitInjector.groovy

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014 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.compiler.traits
+
+import grails.artefact.Controller
+import groovy.transform.CompileStatic
+
+/**
+ *
+ * A {@link TraitInjector} that injects controllers with the {@link Controller} trait
+ *
+ * @author Jeff Brown
+ * @author Graeme Rocher
+ *
+ * @since 3.0
+ *
+ */
+@CompileStatic
+class ControllerTraitInjector implements TraitInjector {
+    
+    @Override
+    Class getTrait() {
+        Controller
+    }
+
+    @Override
+    String[] getArtefactTypes() {
+        ['Controller'] as String[]
+    }
+}

grails-plugin-controllers/src/main/resources/META-INF/grails.factories

@@ -0,0 +1 @@
+grails.compiler.traits.TraitInjector=grails.compiler.traits.ControllerTraitInjector