Merge branch '3.0.x' into 3.1.x

Author: graemerocher

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

@@ -156,7 +156,32 @@ class IOUtils extends SpringIOUtils {
             return new URL("$rootPath/")
         }
         throw new IllegalStateException("Root classpath resource not found! Check your disk permissions")
+    }
+
 
+    /**
+     * This method differs from {@link #findRootResource(java.lang.Class)} in that it will find the root URL where to load resources defined in src/main/resources
+     *
+     * At development time this with be build/main/resources, but in production it will be relative to the class.
+     *
+     * @param targetClass
+     * @param path
+     * @return
+     */
+    static URL findRootResourcesURL(Class targetClass) {
+        def pathToClassFile = '/' + targetClass.name.replace(".", "/") + ".class"
+        def classRes = targetClass.getResource(pathToClassFile)
+        if(classRes) {
+            String rootPath = classRes.toString() - pathToClassFile
+            if(rootPath.endsWith(BuildSettings.BUILD_CLASSES_PATH)) {
+                rootPath = rootPath.replace('/build/classes/', '/build/resources/')
+            }
+            else {
+                rootPath = "$rootPath/"
+            }
+            return new URL(rootPath)
+        }
+        return null
     }
 
     /**
@@ -180,6 +205,7 @@ class IOUtils extends SpringIOUtils {
     }
     /**
      * Finds a URL within a JAR relative (from the root) to the given class
+     *
      * @param targetClass
      * @param path
      * @return
@@ -197,6 +223,7 @@ class IOUtils extends SpringIOUtils {
         return null
     }
 
+
     @Memoized
     public static File findApplicationDirectoryFile() {
         def directory = findApplicationDirectory()
@@ -210,6 +237,27 @@ class IOUtils extends SpringIOUtils {
         return null
     }
 
+    /**
+     * Finds the application directory for the given class
+     *
+     * @param targetClass The target class
+     * @return The application directory or null if it can't be found
+     */
+    public static File findApplicationDirectoryFile(Class targetClass) {
+
+        def rootResource = findRootResource(targetClass)
+        if(rootResource != null) {
+
+            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)
+            }
+        }
+        return null
+    }
+
     @Memoized
     public static String findApplicationDirectory() {
         if(applicationDirectory) {

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

@@ -306,6 +306,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-bootstrap/src/main/groovy/grails/util/Environment.java

@@ -280,7 +280,8 @@ public static boolean isDevelopmentEnvironmentAvailable() {
      * @return True if the development sources are present
      */
     public static boolean isDevelopmentRun() {
-        return BuildSettings.GRAILS_APP_DIR_PRESENT && Boolean.getBoolean(RUN_ACTIVE);
+        Environment env = Environment.getCurrent();
+        return BuildSettings.GRAILS_APP_DIR_PRESENT && Boolean.getBoolean(RUN_ACTIVE) && (env == Environment.DEVELOPMENT);
     }
     /**
      * Check whether the application is deployed

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

@@ -25,6 +25,7 @@
 import org.springframework.core.io.support.ResourcePatternResolver;
 import org.springframework.util.StringUtils;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -46,9 +47,14 @@ public class BinaryGrailsPlugin extends DefaultGrailsPlugin {
     public static final char UNDERSCORE = '_';
     public static final String PROPERTIES_EXTENSION = ".properties";
 
-    private BinaryGrailsPluginDescriptor descriptor;
+    private final BinaryGrailsPluginDescriptor descriptor;
     private Class[] providedArtefacts = {};
-    private Map<String, Class> precompiledViewMap = new HashMap<String, Class>();
+    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;
 
     /**
      * Creates a binary plugin instance.
@@ -60,13 +66,36 @@ public class BinaryGrailsPlugin extends DefaultGrailsPlugin {
     public BinaryGrailsPlugin(Class<?> pluginClass, BinaryGrailsPluginDescriptor descriptor, GrailsApplication application) {
         super(pluginClass, application);
         this.descriptor = descriptor;
+        URL rootResource = IOUtils.findRootResource(pluginClass);
+        if(rootResource == null) {
+            throw new PluginException("Cannot evaluate plugin location for plugin " + pluginClass);
+        }
+        this.baseResource = new UrlResource(rootResource);
+        try {
+            this.baseResourceString = baseResource.getURL().toString();
+        } 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);
+        if(rootResourcesURL == null) {
+            throw new PluginException("Cannot evaluate plugin location for plugin " + pluginClass);
+        }
+
+        this.baseResourcesResource= new UrlResource(rootResourcesURL);
         if (descriptor != null) {
             initializeProvidedArtefacts(descriptor.getProvidedlassNames());
             initializeViewMap(descriptor);
         }
     }
 
+    public File getProjectDirectory() {
+        return projectDirectory;
+    }
+
     protected void initializeViewMap(BinaryGrailsPluginDescriptor descriptor) {
         final Resource descriptorResource = descriptor.getResource();
 
@@ -174,7 +203,7 @@ public Resource getResource(String path) {
      * @return The properties or null if non exist
      */
     public Properties getProperties(final Locale locale) {
-        Resource url = findPluginJar();
+        Resource url = this.baseResourcesResource;
         Properties properties = null;
         if(url != null) {
             StaticResourceLoader resourceLoader = new StaticResourceLoader();
@@ -183,42 +212,39 @@ public Properties getProperties(final Locale locale) {
             try {
                 // first load all properties
                 Resource[] resources = resolver.getResources('*' + PROPERTIES_EXTENSION);
-                resources = filterResources(resources, locale);
-                properties = new Properties();
-
-                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;
             }
         }
         return properties;
     }
 
-    protected Resource findPluginJar() {
-        URL url = IOUtils.findJarResource(pluginClass);
-        if(url != null) {
-            return new UrlResource(url);
-        }
-        return null;
-    }
 
     private Resource[] filterResources(Resource[] resources, Locale locale) {
         List<Resource> finalResources = new ArrayList<Resource>(resources.length);

grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/agent/AgentTasksEnhancer.groovy

@@ -34,28 +34,30 @@ class AgentTasksEnhancer implements Action<Project> {
     private void addAgent(Project project, JavaExec exec, File agent) {
 
         GrailsExtension.Agent agentConfig = project.extensions.findByType(GrailsExtension)?.agent ?: new GrailsExtension.Agent()
+        if(agentConfig.enabled) {
+            exec.jvmArgs "-javaagent:${agentConfig.path?.absolutePath ?: agent.absolutePath}"
 
-        exec.jvmArgs "-javaagent:${agentConfig.path?.absolutePath ?: agent.absolutePath}"
+            for(arg in agentConfig.jvmArgs) {
+                exec.jvmArgs arg
+            }
+            for(entry in agentConfig.systemProperties) {
+                exec.systemProperty(entry.key, entry.value)
+            }
 
-        for(arg in agentConfig.jvmArgs) {
-            exec.jvmArgs arg
-        }
-        for(entry in agentConfig.systemProperties) {
-            exec.systemProperty(entry.key, entry.value)
+            Map<String, String> agentArgs= [
+                    inclusions: agentConfig.inclusions,
+                    synchronize: String.valueOf( agentConfig.synchronize ),
+                    allowSplitPackages: String.valueOf( agentConfig.allowSplitPackages ),
+                    cacheDir: agentConfig.cacheDir ? project.mkdir(agentConfig.cacheDir) : project.mkdir("build/springloaded")
+            ]
+            if(agentConfig.logging != null) {
+                agentArgs.put("logging", String.valueOf(agentConfig.logging))
+            }
+            if(agentConfig.exclusions) {
+                agentArgs.put('exclusions', agentConfig.exclusions)
+            }
+            exec.systemProperty('springloaded', agentArgs.collect { entry -> "$entry.key=$entry.value"}.join(';'))
         }
 
-        Map<String, String> agentArgs= [
-                inclusions: agentConfig.inclusions,
-                synchronize: String.valueOf( agentConfig.synchronize ),
-                allowSplitPackages: String.valueOf( agentConfig.allowSplitPackages ),
-                cacheDir: agentConfig.cacheDir ? project.mkdir(agentConfig.cacheDir) : project.mkdir("build/springloaded")
-        ]
-        if(agentConfig.logging != null) {
-            agentArgs.put("logging", String.valueOf(agentConfig.logging))
-        }
-        if(agentConfig.exclusions) {
-            agentArgs.put('exclusions', agentConfig.exclusions)
-        }
-        exec.systemProperty('springloaded', agentArgs.collect { entry -> "$entry.key=$entry.value"}.join(';'))
     }
 }