Fix deploying with a slim war. Fixes #10090

Author: graemerocher

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

@@ -125,6 +125,7 @@ public enum Environment {
     private static final String GRAILS_IMPLEMENTATION_TITLE = "Grails";
     private static final String GRAILS_VERSION;
     private static final boolean STANDALONE_DEPLOYED;
+    private static final boolean WAR_DEPLOYED;
 
     static {
         Package p = Environment.class.getPackage();
@@ -198,6 +199,23 @@ public enum Environment {
         else {
             STANDALONE_DEPLOYED = false;
         }
+
+        URL loadedLocation = Environment.class.getClassLoader().getResource(Metadata.FILE);
+        if(loadedLocation != null ) {
+            String path = loadedLocation.getPath();
+            WAR_DEPLOYED = isWebPath(path);
+        }
+        else {
+
+            loadedLocation = Thread.currentThread().getContextClassLoader().getResource(Metadata.FILE);
+            if(loadedLocation != null ) {
+                String path = loadedLocation.getPath();
+                WAR_DEPLOYED = isWebPath(path);
+            }
+            else {
+                WAR_DEPLOYED = false;
+            }
+        }
     }
 
     public static Throwable currentReloadError = null;
@@ -324,17 +342,17 @@ public static boolean isDevelopmentRun() {
      * @return true if is
      */
     public static boolean isWarDeployed() {
-        URL loadedLocation = Environment.class.getClassLoader().getResource(Metadata.FILE);
-        if(loadedLocation != null && loadedLocation.getPath().contains("/WEB-INF/classes")) {
-            return true;
-        }
-        // Workaround for weblogic who repacks files from 'classes' into a new jar under lib/
-        if (loadedLocation != null && loadedLocation.getPath().contains("_wl_cls_gen.jar!/")) {
-            return true;
+        if(!isStandalone()) {
+            return WAR_DEPLOYED;
         }
         return false;
     }
 
+    private static boolean isWebPath(String path) {
+        // Workaround for weblogic who repacks files from 'classes' into a new jar under lib/
+        return path.contains("/WEB-INF/classes") || path.contains("_wl_cls_gen.jar!/");
+    }
+
     /**
      * Whether the application has been executed standalone via static void main.
      *

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

@@ -174,7 +174,7 @@ class GroovyPagesGrailsPlugin extends Plugin {
                 resourceLoader = groovyPageResourceLoader
             }
             if (deployed) {
-                def defaultViews = getClass().classLoader.getResource('gsp/views.properties')
+                Resource defaultViews = applicationContext?.getResource('gsp/views.properties')
                 List<Resource> allViewsProperties = []
 
                 for(plugin in pluginManager?.allPlugins) {
@@ -188,7 +188,7 @@ class GroovyPagesGrailsPlugin extends Plugin {
                     }
                 }
                 if(defaultViews != null) {
-                    allViewsProperties.add(new UrlResource(defaultViews))
+                    allViewsProperties.add(defaultViews)
                 }
 
                 allViewsProperties = allViewsProperties?.findAll { Resource r ->