Merge branch '3.0.x' into 3.1.x

Author: graemerocher

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

@@ -15,6 +15,7 @@ import org.springframework.context.ResourceLoaderAware
 import org.springframework.context.annotation.Bean
 import org.springframework.core.io.DefaultResourceLoader
 import org.springframework.core.io.Resource
+import org.springframework.core.io.UrlResource
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver
 import org.springframework.core.io.support.ResourcePatternResolver
 import org.springframework.core.type.classreading.CachingMetadataReaderFactory
@@ -213,23 +214,33 @@ class GrailsAutoConfiguration implements GrailsApplicationClass, ApplicationCont
     private static class ApplicationRelativeClassLoader extends URLClassLoader {
 
         final URL rootResource
+        final Class applicationClass
+        final boolean jarDeployed
 
         ApplicationRelativeClassLoader(Class applicationClass) {
             super([ IOUtils.findRootResource(applicationClass)] as URL[])
 
             this.rootResource = getURLs()[0]
+            this.applicationClass = applicationClass
             def urlStr = rootResource.toString()
+            jarDeployed = urlStr.startsWith("jar:")
             try {
                 def withoutBang = new URL("${urlStr.substring(0, urlStr.length() - 2)}/")
                 addURL(withoutBang)
+
             } catch (MalformedURLException e) {
                 // ignore, running as a WAR
             }
         }
 
         @Override
         Enumeration<URL> getResources(String name) throws IOException {
-            return super.findResources(name)
+            if(jarDeployed && name == '') {
+                return applicationClass.getClassLoader().getResources(name)
+            }
+            else {
+                return super.findResources(name)
+            }
         }
     }
 

grails-core/src/main/groovy/grails/config/Settings.groovy

@@ -174,6 +174,11 @@ interface Settings {
      */
     String RESOURCES_PATTERN = 'grails.resources.pattern'
 
+    /**
+     * The default pattern for static resources
+     */
+    String DEFAULT_RESOURCE_PATTERN = '/static/**'
+
     /**
      * Whether to log request parameters in the console
      */

grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/ControllersGrailsPlugin.groovy

@@ -79,7 +79,7 @@ class ControllersGrailsPlugin extends Plugin {
         String grailsServletPath = config.getProperty(Settings.WEB_SERVLET_PATH, '/')
         int resourcesCachePeriod = config.getProperty(Settings.RESOURCES_CACHE_PERIOD, Integer, 0)
         boolean resourcesEnabled = config.getProperty(Settings.RESOURCES_ENABLED, Boolean, true)
-        String resourcesPattern = config.getProperty(Settings.RESOURCES_PATTERN, String, '/static/**')
+        String resourcesPattern = config.getProperty(Settings.RESOURCES_PATTERN, String, Settings.DEFAULT_RESOURCE_PATTERN)
 
         bootStrapClassRunner(BootStrapClassRunner)
         tokenResponseActionResultTransformer(TokenResponseActionResultTransformer)

grails-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsGrailsPlugin.groovy

@@ -74,8 +74,6 @@ class UrlMappingsGrailsPlugin extends Plugin {
         urlMappingsErrorPageCustomizer(UrlMappingsErrorPageCustomizer)
         grailsLinkGenerator(cacheUrls ? CachingLinkGenerator : DefaultLinkGenerator, serverURL)
 
-
-
         if (isReloadEnabled) {
             urlMappingsTargetSource(HotSwappableTargetSourceFactoryBean) {
                 it.lazyInit = true

grails-test-suite-base/src/main/groovy/org/grails/web/taglib/AbstractGrailsTagTests.groovy

@@ -98,7 +98,9 @@ abstract class AbstractGrailsTagTests extends GroovyTestCase {
     }
 
     GrailsWebRequest buildMockRequest(ConfigObject co) throws Exception {
+        co.grails.resources.pattern = '/**'
         def config = new PropertySourcesConfig().merge(co)
+
         ga.config = config
         Holders.config = config
         servletContext.setAttribute(GrailsApplicationAttributes.APPLICATION_CONTEXT, appCtx)
@@ -222,6 +224,7 @@ abstract class AbstractGrailsTagTests extends GroovyTestCase {
         grailsApplication = new DefaultGrailsApplication(gcl.loadedClasses, gcl)
         grailsApplication.metadata[Metadata.APPLICATION_NAME] = getClass().name
         ga = grailsApplication
+        ga.config.grails.resources.pattern = '/**'
         ga.config.grails.gsp.tldScanPattern = 'classpath*:/META-INF/spring*.tld,classpath*:/META-INF/fmt.tld,classpath*:/META-INF/c.tld,classpath*:/META-INF/core.tld,classpath*:/META-INF/c-1_0-rt.tld'
         grailsApplication.initialise()
         mockManager = new MockGrailsPluginManager(grailsApplication)

grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultLinkGenerator.groovy

@@ -15,13 +15,16 @@
  */
 package org.grails.web.mapping
 
+import grails.config.Settings
 import grails.util.GrailsClassUtils
 import grails.web.CamelCaseUrlConverter
 import grails.web.mapping.LinkGenerator
 import grails.web.mapping.UrlCreator
 import grails.web.mapping.UrlMapping
 import grails.web.mapping.UrlMappingsHolder
+import org.springframework.beans.factory.annotation.Value
 
+import javax.annotation.PostConstruct
 import java.util.regex.Pattern
 
 import grails.util.Environment
@@ -76,6 +79,7 @@ class DefaultLinkGenerator implements LinkGenerator, org.codehaus.groovy.grails.
     ]
     String configuredServerBaseURL
     String contextPath
+    String resourcePath
 
     GrailsRequestStateLookupStrategy requestStateLookupStrategy = new DefaultRequestStateLookupStrategy()
 
@@ -92,6 +96,11 @@ class DefaultLinkGenerator implements LinkGenerator, org.codehaus.groovy.grails.
     @Autowired(required = false)
     UrlConverter grailsUrlConverter = new CamelCaseUrlConverter()
 
+    @Value('${grails.resources.pattern:/static/**}')
+    String resourcePattern = Settings.DEFAULT_RESOURCE_PATTERN
+
+
+
     DefaultLinkGenerator(String serverBaseURL, String contextPath) {
         configuredServerBaseURL = serverBaseURL
         this.contextPath = contextPath
@@ -101,6 +110,13 @@ class DefaultLinkGenerator implements LinkGenerator, org.codehaus.groovy.grails.
         configuredServerBaseURL = serverBaseURL
     }
 
+    @PostConstruct
+    void initializeResourcePath() {
+        if(resourcePattern?.endsWith('/**')) {
+            resourcePath = resourcePattern.substring(0, resourcePattern.length() - 3)
+        }
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -324,7 +340,7 @@ class DefaultLinkGenerator implements LinkGenerator, org.codehaus.groovy.grails.
         StringBuilder url = new StringBuilder(absolutePath?.toString() ?: '')
         def dir = attrs.dir?.toString()
         if (attrs.plugin) {
-            url << pluginManager?.getPluginPath(attrs.plugin?.toString()) ?: ''
+            url.append pluginManager?.getPluginPath(attrs.plugin?.toString()) ?: ''
         }
         else {
             if (contextPathAttribute == null) {
@@ -335,19 +351,24 @@ class DefaultLinkGenerator implements LinkGenerator, org.codehaus.groovy.grails.
             }
         }
 
+
+        def slash = '/'
+        if(resourcePath != null) {
+            url.append(resourcePath)
+        }
         if (dir) {
-            if (!dir.startsWith('/')) {
-                url << '/'
+            if (!dir.startsWith(slash)) {
+                url.append slash
             }
-            url << dir
+            url.append dir
         }
 
         def file = attrs.file?.toString()
         if (file) {
-            if (!(file.startsWith('/') || (dir != null && dir.endsWith('/')))) {
-                url << '/'
+            if (!(file.startsWith(slash) || (dir != null && dir.endsWith(slash)))) {
+                url.append slash
             }
-            url << file
+            url.append file
         }
 
         return url.toString()

grails-web-url-mappings/src/test/groovy/org/codehaus/groovy/grails/web/mapping/LinkGeneratorSpec.groovy

@@ -23,13 +23,30 @@ class LinkGeneratorSpec extends Specification {
 
     def baseUrl = "http://myserver.com/foo"
     def context = "/bar"
+    def resourcePath = ''
     def someAbsoluteUrl = "http://www.grails.org/"
     def resource = null
     def linkParams = [:]
     def pluginManager
 
     def mainCssResource = [dir:'css', file:'main.css']
 
+
+    def "relative links contain the context with resource path"() {
+        when:
+        resource = mainCssResource
+
+        then:
+        link == "$context/$resource.dir/$resource.file"
+
+        when:
+        resourcePath = '/foo'
+        resource = mainCssResource
+
+        then:
+        link == "$context$resourcePath/$resource.dir/$resource.file"
+    }
+
     def "Test absolute link"() {
         when:
             linkParams.uri = someAbsoluteUrl
@@ -284,6 +301,9 @@ class LinkGeneratorSpec extends Specification {
         generator.grailsUrlConverter = new CamelCaseUrlConverter()
         def urlMappingsHolder = [getReverseMapping: callable,getReverseMappingNoDefault: callable] as UrlMappingsHolder
 
+        if(resourcePath != null) {
+            generator.resourcePath = resourcePath
+        }
         generator.urlMappingsHolder = urlMappingsHolder
         if (pluginManager) {
             generator.pluginManager = pluginManager