Various fixes to Windows reloading issues. Relates to #9637

Author: graemerocher

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

@@ -251,8 +251,9 @@ class IOUtils extends SpringIOUtils {
             def rootFile = new UrlResource(rootResource).file.canonicalFile
 
             def rootPath = rootFile.path
-            if(rootPath.contains(BuildSettings.BUILD_CLASSES_PATH)) {
-                return new File(rootPath - BuildSettings.BUILD_CLASSES_PATH)
+            def buildClassespath = BuildSettings.BUILD_CLASSES_PATH.replace('/', File.separator)
+            if(rootPath.contains(buildClassespath)) {
+                return new File(rootPath - buildClassespath)
             }
         }
         return null
@@ -289,8 +290,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-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/org/grails/plugins/CoreGrailsPlugin.groovy

@@ -198,9 +198,12 @@ class CoreGrailsPlugin extends Plugin {
             }
         }
         else if (event.source instanceof Class) {
-            RuntimeSpringConfiguration springConfig = new DefaultRuntimeSpringConfiguration(applicationContext)
-            RuntimeSpringConfigUtilities.reloadSpringResourcesConfig(springConfig, grailsApplication, (Class) event.source)
-            springConfig.registerBeansWithContext(applicationContext)
+            def clazz = (Class) event.source
+            if(Script.isAssignableFrom(clazz)) {
+                RuntimeSpringConfiguration springConfig = new DefaultRuntimeSpringConfiguration(applicationContext)
+                RuntimeSpringConfigUtilities.reloadSpringResourcesConfig(springConfig, grailsApplication, clazz)
+                springConfig.registerBeansWithContext(applicationContext)
+            }
         }
     }