fix: sitemesh3 rendering

jdaugherty · jdaugherty · commit 4c425ad4f654 · 2025-08-18T14:12:26.000-04:00
diff --git a/grails-gsp/grails-sitemesh3/src/main/groovy/org/grails/plugins/web/taglib/RenderSitemeshTagLib.groovy b/grails-gsp/grails-sitemesh3/src/main/groovy/org/grails/plugins/web/taglib/RenderSitemeshTagLib.groovy
@@ -33,6 +33,10 @@ import grails.gsp.TagLib
 
 import java.nio.CharBuffer
 
+/**
+ * The tags in this library are rendered by sitemesh itself instead of the grails tags so they should always be written
+ * as a 'sitemesh' namespace.
+ */
 @TagLib
 class RenderSitemeshTagLib implements TagLibrary {
 
diff --git a/grails-gsp/grails-sitemesh3/src/main/groovy/org/grails/plugins/web/taglib/SitemeshTagLib.groovy b/grails-gsp/grails-sitemesh3/src/main/groovy/org/grails/plugins/web/taglib/SitemeshTagLib.groovy
@@ -28,10 +28,10 @@ import grails.gsp.TagLib
 
 @TagLib
 class SitemeshTagLib implements TagLibrary {
-    static String namespace = 'sitemesh'
+    static String namespace = 'grailsLayout'
     CodecLookup codecLookup
-    // from org.grails.gsp.compiler.SitemeshPreprocessor
-    public static final String XML_CLOSING_FOR_EMPTY_TAG_ATTRIBUTE_NAME = "gsp_sm_xmlClosingForEmptyTag";
+    // from org.grails.gsp.compiler.GrailsLayoutPreprocessor
+    public static final String XML_CLOSING_FOR_EMPTY_TAG_ATTRIBUTE_NAME = "gsp_sm_xmlClosingForEmptyTag"
 
     SitemeshTagLib(CodecLookup codecLookup) {
         this.codecLookup = codecLookup
@@ -97,9 +97,9 @@ class SitemeshTagLib implements TagLibrary {
         content
     }
 
-    // Grails org.grails.gsp.compiler.SitemeshPreprocessor replaces
-    // <content /> tags with <sitemesh:captureContent /> tags. This just changes them back.
-    // Alternatively, a 'sitemesh:captureContent' ContentBlockExtractingRule can be used.
+    // Grails org.grails.gsp.compiler.GrailsLayoutPreprocessor replaces
+    // <content /> tags with <grailsLayout:captureContent /> tags. This just changes them back.
+    // Alternatively, a 'grailsLayout:captureContent' ContentBlockExtractingRule can be used.
     // See: GrailsTagRuleBundle
     Closure captureContent = { attrs, body ->
         StringBuilder tag = new StringBuilder('<content ')
@@ -119,7 +119,7 @@ class SitemeshTagLib implements TagLibrary {
     /**
      * Allows passing of parameters to Sitemesh layout.<br/>
      *
-     * &lt;sitemesh:parameter name="foo" value="bar" /&gt;
+     * &lt;grailsLayout:parameter name="foo" value="bar" /&gt;
      */
     Closure parameter = { Map attrs, body ->
         captureTagContent(out, 'parameter', attrs, body)
diff --git a/grails-test-examples/gsp-sitemesh3/src/integration-test/groovy/EndToEndSpec.groovy b/grails-test-examples/gsp-sitemesh3/src/integration-test/groovy/EndToEndSpec.groovy
@@ -24,7 +24,6 @@ import spock.lang.PendingFeature
 @Integration
 class EndToEndSpec extends ContainerGebSpec {
 
-    @PendingFeature
     def 'simple layout'() {
         when:
         go('endToEnd/simpleLayout')
@@ -35,7 +34,6 @@ class EndToEndSpec extends ContainerGebSpec {
 </body></html>"""
     }
 
-    @PendingFeature
     def 'title in subtemplate'() {
         when:
         go('endToEnd/titleInSubtemplate')
@@ -58,7 +56,6 @@ class EndToEndSpec extends ContainerGebSpec {
 </body></html>"""
     }
 
-    @PendingFeature
     def 'parameters'() {
         when:
         go('endToEnd/parameters')
@@ -67,7 +64,6 @@ class EndToEndSpec extends ContainerGebSpec {
         pageSource == """<html><head></head><body><h1>pageProperty: here!</h1></body></html>"""
     }
 
-    @PendingFeature
     def 'parameters with logic'() {
         when:
         go('endToEnd/parametersWithLogic')
@@ -76,7 +72,6 @@ class EndToEndSpec extends ContainerGebSpec {
         pageSource == "<html><head></head><body>good</body></html>"
     }
 
-    @PendingFeature
     def 'multiline title'() {
         when:
         go('endToEnd/multilineTitle')
