Merge branch '2.1.x' into 2.2.x

Conflicts:
	build.gradle
	build.properties
	gradle/assemble.gradle
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java

Author: lhotari

build.gradle

@@ -38,6 +38,8 @@ ext {
 
     spockVersion = '0.7-groovy-2.0'
     springLoadedVersion = "1.1.3"
+    springLoadedCommonOptions = "-noverify -Dspringloaded.synchronize=true -Djdk.reflect.allowGetCallerClass=true"
+    springLoadedVersion = "1.1.3"
     springVersion = "3.1.4.RELEASE"
     springWebflowVersion= "2.0.8.RELEASE"
     hibernateVersion = "3.6.10.Final"

gradle/assemble.gradle

@@ -139,8 +139,8 @@ task installResources(type: Copy) {
         filter(ReplaceTokens, tokens: ['starter.main.class': 'org.codehaus.groovy.grails.cli.support.GrailsStarter'])
         filter(ReplaceTokens, tokens: ['windows.starter.classpath': "%GRAILS_HOME%\\lib\\org.codehaus.groovy\\groovy-all\\jars\\groovy-all-${groovyVersion}.jar;%GRAILS_HOME%\\dist\\grails-bootstrap-${grailsVersion}.jar".toString()])
         filter(ReplaceTokens, tokens: ['starter.classpath': "\$GRAILS_HOME/lib/org.codehaus.groovy/groovy-all/jars/groovy-all-${groovyVersion}.jar:\$GRAILS_HOME/dist/grails-bootstrap-${grailsVersion}.jar".toString()])
-        filter(ReplaceTokens, tokens: ['agent.string': "-javaagent:\$AGENT_GRAILS_HOME/lib/org.springsource.springloaded/springloaded-core/jars/springloaded-core-${springLoadedVersion}.jar -noverify -Dspringloaded.synchronize=true -Dspringloaded=\$SPRINGLOADED_PARAMS".toString()])
-        filter(ReplaceTokens, tokens: ['windows.agent.string': "-javaagent:%GRAILS_HOME:\\=/%/lib/org.springsource.springloaded/springloaded-core/jars/springloaded-core-${springLoadedVersion}.jar -noverify -Dspringloaded.synchronize=true -Dspringloaded=\\\"%SPRINGLOADED_PARAMS%\\\"".toString()])
+        filter(ReplaceTokens, tokens: ['agent.string': "-javaagent:\$AGENT_GRAILS_HOME/lib/org.springsource.springloaded/springloaded-core/jars/springloaded-core-${springLoadedVersion}.jar ${springLoadedCommonOptions} -Dspringloaded=\$SPRINGLOADED_PARAMS".toString()])
+        filter(ReplaceTokens, tokens: ['windows.agent.string': "-javaagent:%GRAILS_HOME:\\=/%/lib/org.springsource.springloaded/springloaded-core/jars/springloaded-core-${springLoadedVersion}.jar ${springLoadedCommonOptions} -Dspringloaded=\\\"%SPRINGLOADED_PARAMS%\\\"".toString()])
         filter(ReplaceTokens, tokens: ['startup.command': ''])
         fileMode = 0755
     }

grails-wrapper/build.gradle

@@ -13,10 +13,10 @@ task copyScript(type: Copy) {
         filter(ReplaceTokens, tokens: ['grails.version': grailsVersion])
         filter(ReplaceTokens, tokens: ['starter.main.class': 'org.grails.wrapper.GrailsWrapper'])
         filter(ReplaceTokens, tokens: ['starter.classpath': '@wrapperDir@/grails-wrapper-runtime-@[email protected]:@wrapperDir@:.'])
-        filter(ReplaceTokens, tokens: ['agent.string': '-javaagent:@wrapperDir@/springloaded-core-@[email protected] -noverify -Dspringloaded=\\"$SPRINGLOADED_PARAMS\\"'])
+        filter(ReplaceTokens, tokens: ['agent.string': '-javaagent:@wrapperDir@/springloaded-core-@[email protected] @springLoadedCommonOptions@ -Dspringloaded=\$SPRINGLOADED_PARAMS'])
         filter(ReplaceTokens, tokens: ['startup.command': 'startGrails $STARTER_MAIN_CLASS "$@"'])
         filter(ReplaceTokens, tokens: ['windows.starter.classpath': '@wrapperDir@/grails-wrapper-runtime-@[email protected];@wrapperDir@;.'])
-        filter(ReplaceTokens, tokens: ['windows.agent.string': '-javaagent:@wrapperDir@/springloaded-core-@[email protected] -noverify -Dspringloaded=\\"%SPRINGLOADED_PARAMS%\\"'.toString()])
+        filter(ReplaceTokens, tokens: ['windows.agent.string': '-javaagent:@wrapperDir@/springloaded-core-@[email protected] @springLoadedCommonOptions@ -Dspringloaded=\\"%SPRINGLOADED_PARAMS%\\"'.toString()])
         fileMode = 0755
     }
 
@@ -30,7 +30,7 @@ task runtimeJar(type: Jar) {
 jar {
   from runtimeJar
   from "${buildDir}/scripts", {
-    filter org.apache.tools.ant.filters.ReplaceTokens, tokens: [springLoadedVersion: springLoadedVersion, grailsVersion: grailsVersion]
+    filter org.apache.tools.ant.filters.ReplaceTokens, tokens: [springLoadedVersion: springLoadedVersion, grailsVersion: grailsVersion, springLoadedCommonOptions: springLoadedCommonOptions]
   }
   // TODO
   exclude 'org/**'