Merge branch '3.0.x' into 3.1.x

Author: graemerocher

grails-bootstrap/src/main/groovy/grails/util/Environment.java

@@ -292,8 +292,11 @@ public static boolean isWarDeployed() {
         if(loadedLocation != null && loadedLocation.getPath().contains("/WEB-INF/classes")) {
             return true;
         }
+        // Workaround for weblogic who repacks files from 'classes' into a new jar under lib/
+        if (loadedLocation != null && loadedLocation.getPath().contains("_wl_cls_gen.jar!/")) {
+            return true;
+        }
         return false;
-
     }
 
     /**

grails-core/build.gradle

@@ -16,6 +16,11 @@ dependencies {
     compile("org.springframework:spring-context:${springVersion}") {
         exclude group: 'commons-logging', module:'commons-logging'
     }
+    testCompile("org.springframework:spring-jdbc:${springVersion}") {
+        exclude group: 'commons-logging', module:'commons-logging'
+    }
+    testRuntime 'com.h2database:h2:1.3.176'
+
     provided("org.springframework:spring-test:${springVersion}") {
         exclude group: 'commons-logging', module:'commons-logging'
     }

grails-core/src/main/groovy/org/grails/config/yaml/YamlPropertySourceLoader.groovy

@@ -113,5 +113,4 @@ class YamlPropertySourceLoader extends YamlProcessor implements PropertySourceLo
 		return null
 	}
 
-
 }

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

@@ -93,7 +93,7 @@ public AbstractGrailsPlugin(Class<?> pluginClass, GrailsApplication application)
             try {
                 if (filename.equals(PLUGIN_YML)) {
                     YamlPropertySourceLoader propertySourceLoader = new YamlPropertySourceLoader();
-                    this.propertySource = propertySourceLoader.load(GrailsNameUtils.getLogicalPropertyName(pluginClass.getSimpleName(), "GrailsPlugin") + "-" + PLUGIN_YML, resource, null, false, DEFAULT_CONFIG_IGNORE_LIST);
+                    this.propertySource = propertySourceLoader.load(GrailsNameUtils.getLogicalPropertyName(pluginClass.getSimpleName(), "GrailsPlugin") + "-" + PLUGIN_YML, resource, null, true, DEFAULT_CONFIG_IGNORE_LIST);
                 } else if (filename.equals(PLUGIN_GROOVY)) {
                     GroovyConfigPropertySourceLoader propertySourceLoader = new GroovyConfigPropertySourceLoader();
                     this.propertySource = propertySourceLoader.load(GrailsNameUtils.getLogicalPropertyName(pluginClass.getSimpleName(), "GrailsPlugin") + "-" + PLUGIN_GROOVY, resource, null, DEFAULT_CONFIG_IGNORE_LIST);

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

@@ -17,6 +17,7 @@
 
 import grails.core.GrailsApplication;
 import grails.io.IOUtils;
+import grails.io.ResourceUtils;
 import grails.plugins.exceptions.PluginException;
 import org.grails.core.io.StaticResourceLoader;
 import org.springframework.core.io.Resource;
@@ -52,7 +53,6 @@ public class BinaryGrailsPlugin extends DefaultGrailsPlugin {
     private final Map<String, Class> precompiledViewMap = new HashMap<String, Class>();
     private final Resource baseResource;
     private final Resource baseResourcesResource;
-    private final String baseResourceString;
     private final boolean isJar;
     private final File projectDirectory;
 
@@ -72,12 +72,10 @@ public BinaryGrailsPlugin(Class<?> pluginClass, BinaryGrailsPluginDescriptor des
         }
         this.baseResource = new UrlResource(rootResource);
         try {
-            this.baseResourceString = baseResource.getURL().toString();
+            this.isJar = ResourceUtils.isJarURL(baseResource.getURL());
         } catch (IOException e) {
             throw new PluginException("Cannot evaluate plugin location for plugin " + pluginClass, e);
         }
-
-        this.isJar = baseResourceString.startsWith("jar:");
         this.projectDirectory = isJar ? null : IOUtils.findApplicationDirectoryFile(pluginClass);
 
         URL rootResourcesURL = IOUtils.findRootResourcesURL(pluginClass);

grails-core/src/main/groovy/org/grails/transaction/transform/TransactionalTransform.groovy

@@ -308,9 +308,11 @@ class TransactionalTransform implements ASTTransformation{
 
         methodNode.setCode(null)
         classNode.addMethod(renamedMethodNode)
-        
-        processVariableScopes(source, classNode, renamedMethodNode)
-        
+
+        if( !isSpockTest(classNode) ) {
+            processVariableScopes(source, classNode, renamedMethodNode)
+        }
+
         final originalMethodCall = new MethodCallExpression(new VariableExpression("this"), renamedMethodName, new ArgumentListExpression(renamedMethodNode.parameters))
         originalMethodCall.setImplicitThis(false)
         originalMethodCall.setMethodTarget(renamedMethodNode)