Support for relative URIs on JBoss. Fixes #9821

Author: graemerocher

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

@@ -267,6 +267,9 @@ class GroovyPagesGrailsPlugin extends Plugin {
             if (enableReload) {
                 cacheTimeout = gspCacheTimeout
             }
+            else {
+                cache = true
+            }
         }
         // Configure a Spring MVC view resolver
         jspViewResolver(GroovyPageViewResolver) { bean ->

grails-web-common/src/main/groovy/org/grails/web/pages/GroovyPagesUriSupport.java

@@ -38,7 +38,8 @@ public class GroovyPagesUriSupport implements GroovyPagesUriService, org.codehau
     private static final String BLANK = "";
     private static final String UNDERSCORE = "_";
     protected static final String EXTENSION = ".gsp";    
-    protected static final String SUFFIX = ".gsp";    
+    protected static final String SUFFIX = ".gsp";
+    public static final String RELATIVE_STRING = "../";
 
     /**
      * Obtains a template URI for the given controller instance and template name
@@ -117,6 +118,9 @@ public String getTemplateURI(String controllerName, String templateName, boolean
         if (templateName.startsWith(SLASH_STR)) {
             return getAbsoluteTemplateURI(templateName, includeExtension);
         }
+        else if(templateName.startsWith(RELATIVE_STRING)) {
+            return getRelativeTemplateURIInternal(templateName, includeExtension);
+        }
 
         FastStringWriter buf = new FastStringWriter();
         String pathToTemplate = BLANK;
@@ -143,7 +147,6 @@ public String getTemplateURI(String controllerName, String templateName, boolean
         }
     }
 
-
     /**
      * Used to resolve template names that are not relative to a controller.
      *
@@ -173,6 +176,7 @@ public String getAbsoluteTemplateURI(String templateName, boolean includeExtensi
         return uri;
     }
 
+
     /**
      * Obtains a view URI of the given controller name and view name
      * @param controllerName The name of the controller
@@ -230,9 +234,12 @@ public String getDeployedAbsoluteViewURI(String viewName) {
     }
 
     private String getViewURIInternal(String viewPathPrefix, String viewName, FastStringWriter buf, boolean includeSuffix) {
-        if (viewName != null && viewName.startsWith(SLASH_STR)) {
+        if (viewName != null && (viewName.startsWith(SLASH_STR) )) {
             return getAbsoluteViewURIInternal(viewName, buf, includeSuffix);
         }
+        else if(viewName.startsWith(RELATIVE_STRING)) {
+            return getRelativeViewURIInternal(viewName, buf, includeSuffix);
+        }
 
         if (viewPathPrefix != null) {
             buf.append(SLASH).append(viewPathPrefix);
@@ -244,6 +251,15 @@ private String getViewURIInternal(String viewPathPrefix, String viewName, FastSt
         return includeSuffix ? buf.append(SUFFIX).toString() : buf.toString();
     }
 
+    private String getRelativeViewURIInternal(String viewName, FastStringWriter buf, boolean includeSuffix) {
+        String tmp = viewName.substring(RELATIVE_STRING.length() - 1, viewName.length());
+        buf.append(tmp);
+        if(includeSuffix) {
+            buf.append(SUFFIX);
+        }
+        return buf.toString();
+    }
+
     private String getAbsoluteViewURIInternal(String viewName, FastStringWriter buf, boolean includeSuffix) {
         String tmp = viewName.substring(1,viewName.length());
         if (tmp.indexOf(SLASH) > -1) {
@@ -257,7 +273,18 @@ private String getAbsoluteViewURIInternal(String viewName, FastStringWriter buf,
             buf.append(viewName.substring(1,viewName.length()));
         }
         if (includeSuffix) {
-            buf.append(SUFFIX).toString();
+            buf.append(SUFFIX);
+        }
+        return buf.toString();
+    }
+
+    private String getRelativeTemplateURIInternal(String templateName, boolean includeSuffix) {
+        String tmp = templateName.substring(RELATIVE_STRING.length() , templateName.length());
+        FastStringWriter buf = new FastStringWriter();
+        buf.append("/_");
+        buf.append(tmp);
+        if(includeSuffix) {
+            buf.append(SUFFIX);
         }
         return buf.toString();
     }

grails-web-common/src/test/groovy/org/grails/web/pages/GroovyPagesUriSupportTests.java

@@ -48,6 +48,7 @@ public void testNoSuffxGetViewURI() {
     public void testGetTemplateURI() {
         GroovyPagesUriSupport uriSupport = new GroovyPagesUriSupport();
         assertEquals("/foo/_bar.gsp", uriSupport.getTemplateURI("foo", "bar"));
+        assertEquals("/_bar.gsp", uriSupport.getTemplateURI("foo", "../bar"));
         assertEquals("/bar/_foo.gsp", uriSupport.getTemplateURI("foo", "/bar/foo"));
         assertEquals("/foo/bar/_foo.gsp", uriSupport.getTemplateURI("foo", "bar/foo"));
     }
@@ -64,6 +65,7 @@ public void testGetViewURIForController() throws IllegalAccessException, Instant
         GroovyObject controller = (GroovyObject) new GroovyClassLoader().parseClass("class FooController { }").newInstance();
         GroovyPagesUriSupport uriSupport = new GroovyPagesUriSupport();
         assertEquals("/foo/bar.gsp", uriSupport.getViewURI(controller, "bar"));
+        assertEquals("/bar.gsp", uriSupport.getViewURI(controller, "../bar"));
         assertEquals("/bar/foo.gsp", uriSupport.getViewURI(controller, "/bar/foo"));
         assertEquals("/foo/bar/foo.gsp", uriSupport.getViewURI(controller, "bar/foo"));
     }