i18n message bundle reloading in fixes in multi project builds

Author: graemerocher

grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy

@@ -297,6 +297,11 @@ class BuildSettings {
      */
     public static final String BUILD_CLASSES_PATH = "build/classes/main"
 
+    /**
+     * The path to the build resources directory
+     */
+    public static final String BUILD_RESOURCES_PATH = "build/resources/main"
+
     public static final File SETTINGS_FILE = new File("${System.getProperty('user.home')}/.grails/settings.groovy")
 
 }

grails-core/src/main/groovy/grails/boot/GrailsApp.groovy

@@ -21,6 +21,7 @@ import org.grails.compiler.injection.GrailsAwareInjectionOperation
 import org.grails.core.util.BeanCreationProfilingPostProcessor
 import org.grails.io.watch.DirectoryWatcher
 import org.grails.io.watch.FileExtensionFileChangeListener
+import org.grails.plugins.BinaryGrailsPlugin
 import org.grails.plugins.support.WatchPattern
 import org.grails.spring.beans.factory.OptimizedAutowireCapableBeanFactory
 import org.springframework.beans.factory.support.DefaultListableBeanFactory
@@ -123,53 +124,46 @@ class GrailsApp extends SpringApplication {
                 }
             })
 
+            def pluginManager = applicationContext.getBean(GrailsPluginManager)
             def pluginManagerListener = createPluginManagerListener(applicationContext)
             directoryWatcher.addListener(pluginManagerListener)
 
             File baseDir = new File(location).canonicalFile
 
             List<File> watchBaseDirectories = [baseDir]
-            def parentDir = baseDir.parentFile
-            File settingsFile = new File(parentDir, "settings.gradle")
-
-            if(settingsFile.exists()) {
-                def cc = new CompilerConfiguration()
-                cc.scriptBaseClass = SettingsFile.name
-                def binding = new Binding()
-                def shell = new GroovyShell(Thread.currentThread().contextClassLoader, binding, cc)
-                try {
-                    shell.evaluate(settingsFile)
-                } catch (Throwable e) {
-                    // ignore
-                }
-                def projectPaths = binding.getVariables().get('projectPaths')
-                if(projectPaths) {
-                    for(path in projectPaths) {
-                        if(path) {
-
-                            def pathStr = path.toString()
-                            if(pathStr.startsWith(':')) {
-                                pathStr = pathStr.substring(1)
-                            }
-                            watchBaseDirectories << new File(parentDir, pathStr)
-                        }
+            for(GrailsPlugin plugin in pluginManager.allPlugins) {
+                if(plugin instanceof BinaryGrailsPlugin) {
+                    BinaryGrailsPlugin binaryGrailsPlugin = (BinaryGrailsPlugin)plugin
+                    def pluginDirectory = binaryGrailsPlugin.projectDirectory
+                    if(pluginDirectory != null) {
+                        watchBaseDirectories << pluginDirectory
                     }
                 }
             }
 
             def locationLength = location.length() + 1
-            def pluginManager = applicationContext.getBean(GrailsPluginManager)
+
             for(GrailsPlugin plugin in pluginManager.allPlugins) {
-                for(WatchPattern wp in plugin.watchedResourcePatterns) {
-                    for(watchBase in watchBaseDirectories) {
-                        if(wp.file) {
-                            def resolvedPath = new File(watchBase, wp.file.path.substring(locationLength))
-                            directoryWatcher.addWatchFile(resolvedPath)
-                        }
-                        else if(wp.directory && wp.extension) {
+                def watchedResourcePatterns = plugin.getWatchedResourcePatterns()
+                if(watchedResourcePatterns != null) {
+
+                    for(WatchPattern wp in new ArrayList<WatchPattern>(watchedResourcePatterns)) {
+                        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))
+                            }
+                            first = false
+                            if(wp.file) {
+                                def resolvedPath = new File(watchBase, wp.file.path.substring(locationLength))
+                                directoryWatcher.addWatchFile(resolvedPath)
+                            }
+                            else if(wp.directory && wp.extension) {
 
-                            def resolvedPath = new File(watchBase, wp.directory.path.substring(locationLength))
-                            directoryWatcher.addWatchDirectory(resolvedPath, wp.extension)
+                                def resolvedPath = new File(watchBase, wp.directory.path.substring(locationLength))
+                                directoryWatcher.addWatchDirectory(resolvedPath, wp.extension)
+                            }
                         }
                     }
                 }

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

@@ -212,30 +212,32 @@ public Properties getProperties(final Locale locale) {
             try {
                 // first load all properties
                 Resource[] resources = resolver.getResources('*' + PROPERTIES_EXTENSION);
-                resources = filterResources(resources, locale);
-                properties = new Properties();
-
-                // message bundles are locale specific. The more underscores the locale has the more specific the locale
-                // so we order by the number of underscores present so that the most specific appears
-                Arrays.sort(resources, new Comparator<Resource>() {
-                    @Override
-                    public int compare(Resource o1, Resource o2) {
-                        String f1 = o1.getFilename();
-                        String f2 = o2.getFilename();
-
-                        int firstUnderscoreCount = StringUtils.countOccurrencesOf(f1, "_");
-                        int secondUnderscoreCount = StringUtils.countOccurrencesOf(f2, "_");
-
-                        if(firstUnderscoreCount == secondUnderscoreCount) {
-                            return 0;
+                resources = resources.length > 0 ? filterResources(resources, locale) : resources;
+                if(resources.length > 0) {
+                    properties = new Properties();
+
+                    // message bundles are locale specific. The more underscores the locale has the more specific the locale
+                    // so we order by the number of underscores present so that the most specific appears
+                    Arrays.sort(resources, new Comparator<Resource>() {
+                        @Override
+                        public int compare(Resource o1, Resource o2) {
+                            String f1 = o1.getFilename();
+                            String f2 = o2.getFilename();
+
+                            int firstUnderscoreCount = StringUtils.countOccurrencesOf(f1, "_");
+                            int secondUnderscoreCount = StringUtils.countOccurrencesOf(f2, "_");
+
+                            if(firstUnderscoreCount == secondUnderscoreCount) {
+                                return 0;
+                            }
+                            else {
+                                return firstUnderscoreCount > secondUnderscoreCount ?  1 : -1;
+                            }
                         }
-                        else {
-                            return firstUnderscoreCount > secondUnderscoreCount ?  1 : -1;
-                        }
-                    }
-                });
+                    });
 
-                loadFromResources(properties, resources);
+                    loadFromResources(properties, resources);
+                }
             } catch (IOException e) {
                 return null;
             }

grails-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/I18nGrailsPlugin.groovy

@@ -106,13 +106,20 @@ class I18nGrailsPlugin extends Plugin {
 
         def nativeascii = application.config.getProperty('grails.enable.native2ascii', Boolean, true)
         def resourcesDir = BuildSettings.RESOURCES_DIR
+        def classesDir = BuildSettings.CLASSES_DIR
+
         if (resourcesDir.exists() && event.source instanceof Resource) {
-            def eventFile = event.source.file.canonicalFile
+            File eventFile = event.source.file.canonicalFile
             def ant = getClass().classLoader.loadClass("groovy.util.AntBuilder").newInstance()
-            File i18nDir = new File("${Environment.current.reloadLocation}/grails-app/i18n").canonicalFile
+            File i18nDir = eventFile.parentFile
             if (isChildOfFile(eventFile, i18nDir)) {
-                executeMessageBundleCopy(ant, eventFile, i18nDir, BuildSettings.RESOURCES_DIR, nativeascii)
-                executeMessageBundleCopy(ant, eventFile, i18nDir, BuildSettings.CLASSES_DIR, nativeascii)
+                if( i18nDir.name == 'i18n' && i18nDir.parentFile.name == 'grails-app') {
+                    def appDir = i18nDir.parentFile.parentFile
+                    resourcesDir = new File(appDir, BuildSettings.BUILD_RESOURCES_PATH)
+                    classesDir = new File(appDir, BuildSettings.BUILD_CLASSES_PATH)
+                }
+                executeMessageBundleCopy(ant, eventFile, i18nDir, resourcesDir, nativeascii)
+                executeMessageBundleCopy(ant, eventFile, i18nDir, classesDir, nativeascii)
             }
         }