Merge remote-tracking branch 'upstream/3.1.x' into 3.1.x

Author: jameskleeh

build.gradle

@@ -32,11 +32,10 @@ ext {
     commonsCollectionsVersion = "3.2.1"
     commonsIOVersion = "2.2"
     commonsLangVersion = "2.6"
-    //datastoreVersion = "5.0.1.RELEASE"
-    datastoreVersion = "5.0.2.BUILD-SNAPSHOT"
+    datastoreVersion = "5.0.2.RELEASE"
     gantVersion = "1.9.6"
     gdocEngineVersion = "1.0.1"
-    groovyVersion = System.getenv('CI_GROOVY_VERSION') ?: "2.4.5"
+    groovyVersion = System.getenv('CI_GROOVY_VERSION') ?: "2.4.6"
     ivyVersion = "2.3.0"
     jansiVersion = "1.11"
     jlineVersion = "2.12"

grails-bom/plugins.properties

@@ -1,14 +1,14 @@
 hibernate=4.3.10.7
-hibernate3=5.0.1
-hibernate4=5.0.1
-hibernate5=5.0.1
-mongodb=5.0.1
-cassandra=5.0.1
-neo4j=5.0.1
+hibernate3=5.0.2
+hibernate4=5.0.2
+hibernate5=5.0.2
+mongodb=5.0.2
+cassandra=5.0.2
+neo4j=5.0.2
 cache=3.0.2
 asset-pipeline=3.0.15
-scaffolding=3.2.0
+scaffolding=3.2.1
 fields=2.1.2
 geb=1.0.1
-views-json=1.0.1
-views-markup=1.0.1
+views-json=1.0.3
+views-markup=1.0.3

grails-bootstrap/src/main/groovy/grails/codegen/model/ModelBuilder.groovy

@@ -111,7 +111,7 @@ trait ModelBuilder {
 
         @Override
         Map<String, Object> asMap() {
-            [ className: className, fullName: fullName, propertyName: propertyName, modelName: propertyName, packageName: packageName, packagePath: packagePath, simpleName: simpleName, lowerCaseName: lowerCaseName]
+            (Map<String,Object>) [ className: className, fullName: fullName, propertyName: propertyName, modelName: propertyName, packageName: packageName, packagePath: packagePath, simpleName: simpleName, lowerCaseName: lowerCaseName]
         }
     }
 

grails-bootstrap/src/main/groovy/grails/io/IOUtils.groovy

@@ -248,11 +248,16 @@ class IOUtils extends SpringIOUtils {
         def rootResource = findRootResource(targetClass)
         if(rootResource != null) {
 
-            def rootFile = new UrlResource(rootResource).file.canonicalFile
+            try {
+                def rootFile = new UrlResource(rootResource).file.canonicalFile
+                def rootPath = rootFile.path
+                def buildClassespath = BuildSettings.BUILD_CLASSES_PATH.replace('/', File.separator)
+                if(rootPath.contains(buildClassespath)) {
+                    return new File(rootPath - buildClassespath)
 
-            def rootPath = rootFile.path
-            if(rootPath.contains(BuildSettings.BUILD_CLASSES_PATH)) {
-                return new File(rootPath - BuildSettings.BUILD_CLASSES_PATH)
+                }
+            } catch (FileNotFoundException fnfe) {
+                return null
             }
         }
         return null
@@ -289,8 +294,10 @@ class IOUtils extends SpringIOUtils {
                 if(classResource) {
                     def file = new UrlResource(classResource).getFile()
                     def path = file.canonicalPath
-                    if(path.contains(BuildSettings.BUILD_CLASSES_PATH)) {
-                        location = path.substring(0, path.indexOf(BuildSettings.BUILD_CLASSES_PATH) - 1)
+
+                    def buildClassespath = BuildSettings.BUILD_CLASSES_PATH.replace('/', File.separator)
+                    if(path.contains(buildClassespath)) {
+                        location = path.substring(0, path.indexOf(buildClassespath) - 1)
                     }
                 }
             }

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/grails/boot/GrailsApp.groovy

@@ -120,6 +120,11 @@ class GrailsApp extends SpringApplication {
                 @Override
                 void onNew(File file, List<String> extensions) {
                     changedFiles << file.canonicalFile
+                    // For some bizarro reason Windows fires onNew events even for files that have
+                    // just been modified and not created
+                    if(System.getProperty("os.name").toLowerCase().indexOf("windows") != -1) {
+                        return
+                    }
                     newFiles << file.canonicalFile
                 }
             })
@@ -129,7 +134,7 @@ class GrailsApp extends SpringApplication {
             directoryWatcher.addListener(pluginManagerListener)
 
             File baseDir = new File(location).canonicalFile
-
+            String baseDirPath = baseDir.canonicalPath
             List<File> watchBaseDirectories = [baseDir]
             for(GrailsPlugin plugin in pluginManager.allPlugins) {
                 if(plugin instanceof BinaryGrailsPlugin) {
@@ -151,8 +156,18 @@ class GrailsApp extends SpringApplication {
                         boolean first = true
                         for(watchBase in watchBaseDirectories) {
                             if(!first) {
-                                // the base project will already been in the list of watch patterns, but we add any subprojects here
-                                plugin.watchedResourcePatterns.add(new WatchPattern(directory: watchBase, extension: wp.extension))
+                                if(wp.file != null) {
+                                    String relativePath = wp.file.canonicalPath - baseDirPath
+                                    File watchFile = new File(watchBase, relativePath)
+                                    // the base project will already been in the list of watch patterns, but we add any subprojects here
+                                    plugin.watchedResourcePatterns.add(new WatchPattern(file: watchFile, extension: wp.extension))
+                                }
+                                else if(wp.directory != null) {
+                                    String relativePath = wp.directory.canonicalPath - baseDirPath
+                                    File watchDir = new File(watchBase, relativePath)
+                                    // the base project will already been in the list of watch patterns, but we add any subprojects here
+                                    plugin.watchedResourcePatterns.add(new WatchPattern(directory: watchDir, extension: wp.extension))
+                                }
                             }
                             first = false
                             if(wp.file) {
@@ -198,7 +213,8 @@ class GrailsApp extends SpringApplication {
                             def changedFile = uniqueChangedFiles[0]
                             changedFile = changedFile.canonicalFile
                             // Groovy files within the 'conf' directory are not compiled
-                            if(changedFile.path.contains('/grails-app/conf/')) {
+                            String confPath = "${File.pathSeparator}grails-app${File.pathSeparator}conf${File.pathSeparator}"
+                            if(changedFile.path.contains(confPath)) {
                                 pluginManager.informOfFileChange(changedFile)
                             }
                             else {
@@ -239,8 +255,10 @@ class GrailsApp extends SpringApplication {
     protected void recompile(File changedFile, CompilerConfiguration compilerConfig, String location) {
         File appDir = null
         def changedPath = changedFile.path
-        if (changedPath.contains('/grails-app')) {
-            appDir = new File(changedPath.substring(0, changedPath.indexOf('/grails-app')))
+
+        String grailsAppDir = "${File.separator}grails-app"
+        if (changedPath.contains(grailsAppDir)) {
+            appDir = new File(changedPath.substring(0, changedPath.indexOf(grailsAppDir)))
         }
         def baseFileLocation = appDir?.absolutePath ?: location
         compilerConfig.setTargetDirectory(new File(baseFileLocation, BuildSettings.BUILD_CLASSES_PATH))

grails-core/src/main/groovy/grails/boot/config/GrailsAutoConfiguration.groovy

@@ -118,7 +118,7 @@ class GrailsAutoConfiguration implements GrailsApplicationClass, ApplicationCont
      */
     Collection<Package> packages() {
         def thisPackage = getClass().package
-        thisPackage ? [ thisPackage ] : []
+        thisPackage ? [ thisPackage ] : new ArrayList<Package>()
     }
 
     /**

grails-core/src/main/groovy/grails/plugins/Plugin.groovy

@@ -165,6 +165,6 @@ abstract class Plugin implements GrailsApplicationLifeCycle, GrailsApplicationAw
         def bb = new BeanBuilder(null, grailsApplication.classLoader)
         bb.beans beanDefinitions
         bb.registerBeans((BeanDefinitionRegistry)applicationContext)
-        new MapBasedSmartPropertyOverrideConfigurer(grailsApplication).postProcessBeanFactory(((ConfigurableApplicationContext)applicationContext).beanFactory)
+        new MapBasedSmartPropertyOverrideConfigurer(grailsApplication: grailsApplication).postProcessBeanFactory(((ConfigurableApplicationContext)applicationContext).beanFactory)
     }
 }

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

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