Merge branch '3.0.x'

Author: graemerocher

build.gradle

@@ -44,8 +44,8 @@ ext {
     reactorVersion = '2.0.6.RELEASE'
 
     spockVersion = '1.0-groovy-2.4'
-    springLoadedVersion = "1.2.4.RELEASE"
     springBootVersion = "1.3.0.RELEASE"
+    springLoadedVersion = "1.2.5.RELEASE"
     springLoadedCommonOptions = "-Xverify:none -Dspringloaded.synchronize=true -Djdk.reflect.allowGetCallerClass=true"
     springVersion = "4.2.3.RELEASE"
     ehcacheVersion = "2.4.6"

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

@@ -544,8 +544,8 @@ private void invokePluginHook(String methodName, Object[] args, ApplicationConte
 
     public void doWithRuntimeConfiguration(RuntimeSpringConfiguration springConfig) {
         Binding b = new Binding();
-        b.setVariable("application", application);
-        b.setVariable(GrailsApplication.APPLICATION_ID, application);
+        b.setVariable("application", grailsApplication);
+        b.setVariable(GrailsApplication.APPLICATION_ID, grailsApplication);
         b.setVariable("manager", getManager());
         b.setVariable("plugin", this);
         b.setVariable("parentCtx", getParentCtx());
@@ -554,7 +554,7 @@ public void doWithRuntimeConfiguration(RuntimeSpringConfiguration springConfig)
         if(plugin instanceof Plugin) {
             Closure c = ((Plugin) plugin).doWithSpring();
             if(c != null) {
-                BeanBuilder bb = new BeanBuilder(getParentCtx(),springConfig, application.getClassLoader());
+                BeanBuilder bb = new BeanBuilder(getParentCtx(),springConfig, grailsApplication.getClassLoader());
                 bb.setBinding(b);
                 bb.invokeMethod("beans", new Object[]{c});
             }
@@ -570,7 +570,7 @@ public void doWithRuntimeConfiguration(RuntimeSpringConfiguration springConfig)
             }
 
             Closure c = (Closure)plugin.getProperty(DO_WITH_SPRING);
-            BeanBuilder bb = new BeanBuilder(getParentCtx(),springConfig, application.getClassLoader());
+            BeanBuilder bb = new BeanBuilder(getParentCtx(),springConfig, grailsApplication.getClassLoader());
             bb.setBinding(b);
             c.setDelegate(bb);
             bb.invokeMethod("beans", new Object[]{c});

grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/agent/AgentTasksEnhancer.groovy

@@ -5,6 +5,7 @@ import org.gradle.api.Action
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.tasks.JavaExec
+import org.grails.gradle.plugin.core.GrailsExtension
 
 /**
  * Sets up the reloading agent based on the agent configuration after the project has been configured
@@ -31,8 +32,30 @@ class AgentTasksEnhancer implements Action<Project> {
     }
 
     private void addAgent(Project project, JavaExec exec, File agent) {
-        exec.jvmArgs "-javaagent:$agent.absolutePath"
-        exec.jvmArgs "-Xverify:none"
-        exec.jvmArgs "-Dspringloaded=inclusions=grails.plugins..*"
+
+        GrailsExtension.Agent agentConfig = project.extensions.findByType(GrailsExtension)?.agent ?: new GrailsExtension.Agent()
+
+        exec.jvmArgs "-javaagent:${agentConfig.path?.absolutePath ?: agent.absolutePath}"
+
+        for(arg in agentConfig.jvmArgs) {
+            exec.jvmArgs arg
+        }
+        for(entry in agentConfig.systemProperties) {
+            exec.systemProperty(entry.key, entry.value)
+        }
+
+        Map<String, String> agentArgs= [
+                inclusions: agentConfig.inclusions,
+                synchronize: String.valueOf( agentConfig.synchronize ),
+                allowSplitPackages: String.valueOf( agentConfig.allowSplitPackages ),
+                cacheDir: agentConfig.cacheDir ? project.mkdir(agentConfig.cacheDir) : project.mkdir("build/springloaded")
+        ]
+        if(agentConfig.logging != null) {
+            agentArgs.put("logging", String.valueOf(agentConfig.logging))
+        }
+        if(agentConfig.exclusions) {
+            agentArgs.put('exclusions', agentConfig.exclusions)
+        }
+        exec.systemProperty('springloaded', agentArgs.collect { entry -> "$entry.key=$entry.value"}.join(';'))
     }
 }

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

@@ -1,6 +1,7 @@
 package org.grails.gradle.plugin.core
 
 import org.apache.tools.ant.taskdefs.condition.Os
+import org.gradle.util.ConfigureUtil
 
 /**
  * A extension to the Gradle plugin to configure Grails settings
@@ -19,4 +20,31 @@ class GrailsExtension {
      * Whether assets should be packaged in META-INF/assets for plugins
      */
     boolean packageAssets = true
+
+    /**
+     * Configure the reloading agent
+     */
+    Agent agent = new Agent()
+
+    /**
+     * Configure the reloading agent
+     */
+    Agent agent(Closure configurer) {
+        ConfigureUtil.configure(configurer, agent)
+    }
+    /**
+     * Configuration for the reloading agent
+     */
+    static class Agent {
+        File path
+        String inclusions = "grails.plugins..*"
+        String exclusions
+        Boolean logging
+        boolean synchronize = true
+        boolean allowSplitPackages = true
+        File cacheDir = new File("build/springloaded")
+
+        Map<String, String> systemProperties = ['jdk.reflect.allowGetCallerClass': 'true']
+        List<String> jvmArgs = ['-Xverify:none']
+    }
 }