Merge branch '3.0.x'

Author: graemerocher

grails-bom/plugins.properties

@@ -3,8 +3,8 @@ hibernate4=5.0.0.RC3
 mongodb=5.0.0.RC3
 cassandra=5.0.0.RC3
 neo4j=5.0.0.RC3
-cache=3.0.1
-asset-pipeline=3.0.14
+cache=3.0.2
+asset-pipeline=3.0.15
 scaffolding=3.1.2
 fields=2.1.1
 geb=1.0.1

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

@@ -142,6 +142,22 @@ class IOUtils extends SpringIOUtils {
         targetClass.getResource('/' + targetClass.name.replace(".", "/") + ".class")
     }
 
+    /**
+     * Returns a URL that represents the root classpath resource where the given class was loaded from
+     *
+     * @param targetClass The target class
+     * @return The URL to class file or null
+     */
+    static URL findRootResource(Class targetClass) {
+        def pathToClassFile = '/' + targetClass.name.replace(".", "/") + ".class"
+        def classRes = targetClass.getResource(pathToClassFile)
+        if(classRes) {
+            def rootPath = classRes.toString() - pathToClassFile
+            return new URL("$rootPath/")
+        }
+        throw new IllegalStateException("Root classpath resource not found! Check your disk permissions")
+
+    }
 
     /**
      * Returns the URL resource for the location on disk of the given class or null if it cannot be found

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

@@ -17,6 +17,7 @@ package grails.io
 
 import grails.util.BuildSettings
 import groovy.transform.CompileStatic
+import groovy.transform.Memoized
 import org.grails.io.support.GrailsResourceUtils
 
 
@@ -38,6 +39,7 @@ class ResourceUtils extends GrailsResourceUtils {
         return getProjectPackageNames(BuildSettings.BASE_DIR)
     }
 
+    @Memoized
     static Iterable<String> getProjectPackageNames(File baseDir) {
         File rootDir = baseDir ? new File(baseDir, "grails-app") : null
         Set<String> packageNames = []

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

@@ -21,11 +21,17 @@
 import groovy.lang.MissingMethodException;
 import org.codehaus.groovy.control.MultipleCompilationErrorsException;
 import org.codehaus.groovy.runtime.DefaultGroovyMethods;
+import org.grails.io.support.Resource;
+import org.grails.io.support.UrlResource;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.util.Locale;
 import java.util.Map;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
 
 /**
  * Represents the current environment.
@@ -105,6 +111,54 @@ public enum Environment {
     private static Holder<Environment> cachedCurrentEnvironment = new Holder<Environment>("Environment");
     private static final boolean DEVELOPMENT_MODE = getCurrent() == DEVELOPMENT && BuildSettings.GRAILS_APP_DIR_PRESENT;
     private static boolean initializingState = false;
+
+    private static final String GRAILS_IMPLEMENTATION_TITLE = "Grails";
+    private static final String GRAILS_VERSION;
+
+    static {
+        Package p = Environment.class.getPackage();
+        String version = p != null ? p.getImplementationVersion() : null;
+        if (version == null || isBlank(version)) {
+            try {
+                URL manifestURL = IOUtils.findResourceRelativeToClass(Environment.class, "/META-INF/MANIFEST.MF");
+                Manifest grailsManifest = null;
+                if(manifestURL != null) {
+                    Resource r = new UrlResource(manifestURL);
+                    if(r.exists()) {
+                        InputStream inputStream = null;
+                        Manifest mf = null;
+                        try {
+                            inputStream = r.getInputStream();
+                            mf = new Manifest(inputStream);
+                        } finally {
+                            try {
+                                inputStream.close();
+                            } catch (IOException e) {
+                                // ignore
+                            }
+                        }
+                        String implTitle = mf.getMainAttributes().getValue(Attributes.Name.IMPLEMENTATION_TITLE);
+                        if (!isBlank(implTitle) && implTitle.equals(GRAILS_IMPLEMENTATION_TITLE)) {
+                            grailsManifest = mf;
+                        }
+                    }
+                }
+
+                if (grailsManifest != null) {
+                    version = grailsManifest.getMainAttributes().getValue(Attributes.Name.IMPLEMENTATION_VERSION);
+                }
+
+                if (isBlank(version)) {
+                    version = "Unknown";
+                }
+            }
+            catch (Exception e) {
+                version = "Unknown";
+            }
+        }
+        GRAILS_VERSION = version;
+    }
+
     public static Throwable currentReloadError = null;
     public static MultipleCompilationErrorsException currentCompilationError = null;
     private String name;
@@ -114,6 +168,12 @@ public enum Environment {
         initialize();
     }
 
+    /**
+     * @return The current Grails version
+     */
+    public static String getGrailsVersion() {
+        return GRAILS_VERSION;
+    }
     public static void setCurrentReloadError(Throwable currentReloadError) {
         Environment.currentReloadError = currentReloadError;
     }

grails-bootstrap/src/main/groovy/org/grails/io/support/GrailsResourceUtils.java

@@ -16,7 +16,9 @@
 package org.grails.io.support;
 
 import grails.util.BuildSettings;
+import groovy.lang.Closure;
 import groovy.util.ConfigObject;
+import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -26,12 +28,7 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -179,6 +176,27 @@ public class GrailsResourceUtils {
             GRAILS_RESOURCE_PATTERN_ELEVENTH_MATCH
     };
 
+    private static Map<String, Boolean> KNOWN_PATHS = new LinkedHashMap<String, Boolean>() {
+        @Override
+        protected boolean removeEldestEntry(Map.Entry eldest) {
+            return this.size() > 100;
+        }
+    };
+
+    private static Map<String, Boolean> KNOWN_DOMAIN_CLASSES = DefaultGroovyMethods.withDefault(new LinkedHashMap<String, Boolean>(){
+        @Override
+        protected boolean removeEldestEntry(Map.Entry<String, Boolean> eldest) {
+            return this.size() > 100;
+        }
+    }, new Closure(GrailsResourceUtils.class) {
+
+        @Override
+        public Object call(Object... args) {
+            String path = args[0].toString();
+            return DOMAIN_PATH_PATTERN.matcher(path).find();
+        }
+    });
+
     private static String createGrailsResourcePattern(String separator, String base) {
         return ".+" + separator + base + separator + "(.+)\\.(groovy|java)$";
     }
@@ -189,10 +207,10 @@ private static String createGrailsResourcePattern(String separator, String base)
      * @param url The URL instance
      * @return true if it is a domain class
      */
+
     public static boolean isDomainClass(URL url) {
         if (url == null) return false;
-
-        return DOMAIN_PATH_PATTERN.matcher(url.getFile()).find();
+        return KNOWN_DOMAIN_CLASSES.get(url.getFile());
     }
 
     /**
@@ -634,13 +652,19 @@ public static URI toURI(String location) throws URISyntaxException {
      * @param path The path to check
      * @return true if it is a Grails path
      */
+
     public static boolean isGrailsPath(String path) {
+        if(KNOWN_PATHS.containsKey(path)) {
+            return KNOWN_PATHS.get(path);
+        }
         for (Pattern grailsAppResourcePattern : grailsAppResourcePatterns) {
             Matcher m = grailsAppResourcePattern.matcher(path);
             if (m.find()) {
+                KNOWN_PATHS.put(path, true);
                 return true;
             }
         }
+        KNOWN_PATHS.put(path, false);
         return false;
     }
 

grails-bootstrap/src/main/groovy/org/grails/io/support/SpringIOUtils.java

@@ -23,6 +23,7 @@
 
 import javax.xml.XMLConstants;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 import java.io.*;
 import java.lang.reflect.Array;
@@ -389,8 +390,12 @@ public static String copyToString(Reader in) throws IOException {
     }
 
     public static XmlSlurper createXmlSlurper() throws ParserConfigurationException, SAXException {
+        return new XmlSlurper(newSAXParser());
+    }
+
+    public static SAXParser newSAXParser() throws ParserConfigurationException, SAXException {
         SAXParserFactory factory = createParserFactory();
-        return new XmlSlurper(factory.newSAXParser());
+        return factory.newSAXParser();
     }
 
     private static SAXParserFactory saxParserFactory = null;

grails-console/src/main/groovy/grails/ui/console/support/GroovyConsoleWebApplicationContext.groovy

@@ -1,6 +1,7 @@
 package grails.ui.console.support
 
 import grails.core.GrailsApplication
+import grails.persistence.support.PersistenceContextInterceptor
 import grails.ui.support.DevelopmentWebApplicationContext
 import grails.util.BuildSettings
 import groovy.transform.CompileStatic
@@ -56,6 +57,18 @@ class GroovyConsoleWebApplicationContext extends DevelopmentWebApplicationContex
             }
         }
 
+        def interceptors = getBeansOfType(PersistenceContextInterceptor).values()
+        groovyConsole.beforeExecution = {
+            for(i in interceptors) {
+                i.init()
+            }
+        }
+
+        groovyConsole.afterExecution = {
+            for(i in interceptors) {
+                i.destroy()
+            }
+        }
         groovyConsole.run()
 
     }

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

@@ -18,6 +18,7 @@ import org.codehaus.groovy.control.CompilerConfiguration
 import org.grails.boot.internal.JavaCompiler
 import org.grails.compiler.injection.AbstractGrailsArtefactTransformer
 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.support.WatchPattern
@@ -46,6 +47,8 @@ class GrailsApp extends SpringApplication {
     private static boolean developmentModeActive = false
     private static DirectoryWatcher directoryWatcher
 
+    boolean enableBeanCreationProfiler = false
+
     @Override
     ConfigurableApplicationContext run(String... args) {
         def applicationContext = super.run(args)
@@ -68,7 +71,13 @@ class GrailsApp extends SpringApplication {
     @Override
     protected ConfigurableApplicationContext createApplicationContext() {
         ConfigurableApplicationContext applicationContext = super.createApplicationContext()
+
         applyAutowireByNamePerformanceOptimization(applicationContext)
+        if(enableBeanCreationProfiler) {
+            def processor = new BeanCreationProfilingPostProcessor()
+            applicationContext.getBeanFactory().addBeanPostProcessor(processor)
+            applicationContext.addApplicationListener(processor)
+        }
         return applicationContext
     }
 
@@ -77,7 +86,9 @@ class GrailsApp extends SpringApplication {
         if(configurableApplicationContext instanceof GenericApplicationContext) {
             Field beanFactoryField = ReflectionUtils.findField(GenericApplicationContext, "beanFactory", DefaultListableBeanFactory)
             ReflectionUtils.makeAccessible(beanFactoryField)
-            ReflectionUtils.setField(beanFactoryField, configurableApplicationContext, new OptimizedAutowireCapableBeanFactory())
+
+            def beanFactory = new OptimizedAutowireCapableBeanFactory()
+            ReflectionUtils.setField(beanFactoryField, configurableApplicationContext, beanFactory)
         }
     }
 

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

@@ -61,7 +61,6 @@ class GrailsApplicationPostProcessor implements BeanDefinitionRegistryPostProces
     boolean loadExternalBeans = true
     boolean reloadingEnabled = RELOADING_ENABLED
 
-
     GrailsApplicationPostProcessor(GrailsApplicationLifeCycle lifeCycle, ApplicationContext applicationContext, Class...classes) {
         this.lifeCycle = lifeCycle
         if(lifeCycle instanceof GrailsApplicationClass) {
@@ -106,7 +105,6 @@ class GrailsApplicationPostProcessor implements BeanDefinitionRegistryPostProces
         for(cls in classes) {
             grailsApplication.addArtefact(cls)
         }
-
         pluginManager.registerProvidedArtefacts(grailsApplication)
     }