fix for GRAILS-12076 and GRAILS-12077

Author: graemerocher

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

@@ -249,19 +249,19 @@ class BuildSettings {
     /**
      * Whether the application is running inside the development environment or deployed
      */
-    public static final boolean IS_DEPLOYED = !new File(BASE_DIR, "grails-app").exists() && !new File(BASE_DIR, "Application.groovy").exists()
+    public static final boolean GRAILS_APP_DIR_PRESENT = new File(BASE_DIR, "grails-app").exists() || new File(BASE_DIR, "Application.groovy").exists()
 
     /**
      * The target directory of the project, null outside of the development environment
      */
-    public static final File TARGET_DIR = IS_DEPLOYED ? null : (System.getProperty(PROJECT_TARGET_DIR) ? new File(System.getProperty(PROJECT_TARGET_DIR)) : new File(BASE_DIR, "build"))
+    public static final File TARGET_DIR = !GRAILS_APP_DIR_PRESENT ? null : (System.getProperty(PROJECT_TARGET_DIR) ? new File(System.getProperty(PROJECT_TARGET_DIR)) : new File(BASE_DIR, "build"))
     /**
      * The resources directory of the project, null outside of the development environment
      */
-    public static final File RESOURCES_DIR = IS_DEPLOYED ? null : (System.getProperty(PROJECT_RESOURCES_DIR) ? new File(System.getProperty(PROJECT_RESOURCES_DIR)) : new File(TARGET_DIR, "resources/main"))
+    public static final File RESOURCES_DIR = !GRAILS_APP_DIR_PRESENT ? null : (System.getProperty(PROJECT_RESOURCES_DIR) ? new File(System.getProperty(PROJECT_RESOURCES_DIR)) : new File(TARGET_DIR, "resources/main"))
     /**
      * The classes directory of the project, null outside of the development environment
      */
-    public static final File CLASSES_DIR = IS_DEPLOYED ? null : (System.getProperty(PROJECT_CLASSES_DIR) ? new File(System.getProperty(PROJECT_CLASSES_DIR)) : new File(TARGET_DIR, "classes/main"))
+    public static final File CLASSES_DIR = !GRAILS_APP_DIR_PRESENT ? null : (System.getProperty(PROJECT_CLASSES_DIR) ? new File(System.getProperty(PROJECT_CLASSES_DIR)) : new File(TARGET_DIR, "classes/main"))
     public static final String RUN_EXECUTED = "grails.run.executed"
 }

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

@@ -193,7 +193,7 @@ public static Environment getCurrentEnvironment() {
      * @return true if the application is running in development mode
      */
     public static boolean isDevelopmentMode() {
-        return getCurrent() == DEVELOPMENT && !(Metadata.getCurrent().isWarDeployed()) &&
+        return getCurrent() == DEVELOPMENT && Metadata.getCurrent().isDevelopmentEnvironmentAvailable() &&
                 cachedHasGrailsHome;
     }
 

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

@@ -238,7 +238,18 @@ public class Metadata extends CodeGenConfig  {
      * @return true if this application is deployed as a WAR
      */
     public boolean isWarDeployed() {
-        return BuildSettings.IS_DEPLOYED && Boolean.getBoolean(BuildSettings.RUN_EXECUTED);
+        def loadedLocation = getClass().getClassLoader().getResource("");
+        if(loadedLocation && loadedLocation.path.contains('/WEB-INF/classes/')) {
+            return true
+        }
+        return false
+    }
+
+    /**
+     * @return True if the development sources are present
+     */
+    boolean isDevelopmentEnvironmentAvailable() {
+        return BuildSettings.GRAILS_APP_DIR_PRESENT;
     }
 
 

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

@@ -39,7 +39,6 @@ class GrailsApp extends SpringApplication {
 
     @Override
     ConfigurableApplicationContext run(String... args) {
-        System.setProperty(BuildSettings.RUN_EXECUTED, "true")
         def applicationContext = super.run(args)
 
         grails.util.Environment environment = grails.util.Environment.getCurrent()

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

@@ -356,7 +356,8 @@ private void evaluateOnChangeListener() {
             onChangeListener = (Closure) GrailsClassUtils.getPropertyOrStaticPropertyOrFieldValue(plugin, ON_CHANGE);
         }
 
-        final boolean warDeployed = Metadata.getCurrent().isWarDeployed();
+        final Metadata metadata = Metadata.getCurrent();
+        final boolean warDeployed = !metadata.isDevelopmentEnvironmentAvailable();
         final boolean reloadEnabled = Environment.getCurrent().isReloadEnabled();
 
         if (!((reloadEnabled || !warDeployed) && onChangeListener != null)) {

grails-gsp/src/main/groovy/org/grails/gsp/io/DefaultGroovyPageLocator.java

@@ -20,6 +20,7 @@
 import grails.plugins.PluginManagerAware;
 import grails.util.CollectionUtils;
 import grails.util.Environment;
+import grails.util.Metadata;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.grails.gsp.GroovyPage;
@@ -334,7 +335,7 @@ protected Resource findResource(List<String> searchPaths) {
     }
 
     private boolean isPrecompiledAvailable() {
-        return precompiledGspMap != null && precompiledGspMap.size() > 0 && warDeployed;
+        return precompiledGspMap != null && precompiledGspMap.size() > 0 && !Metadata.getCurrent().isDevelopmentEnvironmentAvailable();
     }
 
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {

grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/GroovyPagesGrailsPlugin.groovy

@@ -22,6 +22,7 @@ import grails.plugins.Plugin
 import grails.util.BuildSettings
 import grails.util.Environment
 import grails.util.GrailsUtil
+import grails.util.Metadata
 import grails.web.pages.GroovyPagesUriService
 import groovy.transform.CompileStatic
 import groovy.util.logging.Commons
@@ -100,7 +101,7 @@ class GroovyPagesGrailsPlugin extends Plugin {
     Closure doWithSpring() {{->
         def application = grailsApplication
         Config config = application.config
-        boolean developmentMode = !application.warDeployed
+        boolean developmentMode = Metadata.getCurrent().isDevelopmentEnvironmentAvailable()
         Environment env = Environment.current
 
         boolean enableReload = env.isReloadEnabled() ||
@@ -158,7 +159,7 @@ class GroovyPagesGrailsPlugin extends Plugin {
             }
         }
 
-        def deployed = application.warDeployed
+        def deployed = !Metadata.getCurrent().isDevelopmentEnvironmentAvailable()
         groovyPageLocator(CachingGrailsConventionGroovyPageLocator) { bean ->
             bean.lazyInit = true
             if (customResourceLoader) {

grails-web-boot/src/main/groovy/org/grails/compiler/boot/BootInitializerClassInjector.groovy

@@ -66,10 +66,6 @@ class BootInitializerClassInjector extends GlobalClassInjectorAdapter {
                     def parameter = new Parameter(springApplicationBuilder, "application")
                     def methodBody = new BlockStatement()
 
-                    def setRunArguments = new ArgumentListExpression()
-                    setRunArguments.addExpression(new ConstantExpression(BuildSettings.RUN_EXECUTED))
-                    setRunArguments.addExpression(new ConstantExpression(Boolean.TRUE.toString()))
-                    methodBody.addStatement( new ExpressionStatement( new MethodCallExpression( new ClassExpression(ClassHelper.make(System)), "setProperty", setRunArguments)))
                     methodBody.addStatement( new ExpressionStatement( new MethodCallExpression( new VariableExpression(parameter), "sources", new ClassExpression(classNode))))
                     loaderClassNode.addMethod( new MethodNode("configure", Modifier.PROTECTED, springApplicationBuilder, [parameter] as Parameter[], [] as ClassNode[], methodBody))
                     source.getAST().addClass(