Merge pull request #14989 from apache/sitemesh3-fix

Author: jdaugherty

grails-gsp/grails-sitemesh3/src/main/groovy/org/grails/plugins/sitemesh3/Sitemesh3GrailsPlugin.groovy

@@ -19,10 +19,11 @@
 
 package org.grails.plugins.sitemesh3
 
+import grails.core.DefaultGrailsApplication
 import grails.plugins.Plugin
 import org.grails.config.PropertySourcesConfig
+import org.grails.gsp.compiler.GroovyPageParser
 import org.grails.plugins.web.taglib.RenderSitemeshTagLib
-import org.grails.plugins.web.taglib.SitemeshTagLib
 import org.grails.web.config.http.GrailsFilters
 import org.grails.web.util.WebUtils
 import org.springframework.core.env.ConfigurableEnvironment
@@ -47,7 +48,6 @@ class Sitemesh3GrailsPlugin extends Plugin {
 
     def providedArtefacts = [
         RenderSitemeshTagLib,
-        SitemeshTagLib,
     ]
 
     static PropertySource getDefaultPropertySource(ConfigurableEnvironment configurableEnvironment, String defaultLayout) {
@@ -69,19 +69,23 @@ class Sitemesh3GrailsPlugin extends Plugin {
                 props.remove(it.key)
             }
         }
-        return new MapPropertySource("sitemesh3Properties", props)
+        return new MapPropertySource("defaultSitemesh3Properties", props)
     }
 
 
     Closure doWithSpring() {
         { ->
-            ConfigurableEnvironment configurableEnvironment = application.mainContext.environment
+            ConfigurableEnvironment configurableEnvironment = grailsApplication.mainContext.environment as ConfigurableEnvironment
             def propertySources = configurableEnvironment.getPropertySources()
             // https://gsp.grails.org/latest/guide/layouts.html
             // Default view should be application, but it is inefficient to add a rule for a page that may not exist.
             String defaultLayout = grailsApplication.getConfig().getProperty("grails.sitemesh.default.layout")
             propertySources.addFirst(getDefaultPropertySource(configurableEnvironment, defaultLayout))
-            application.config = new PropertySourcesConfig(propertySources)
+            propertySources.addFirst(new MapPropertySource('requiredSitemesh3Properties', [
+                    (GroovyPageParser.CONFIG_PROPERTY_GSP_GRAILS_LAYOUT_PREPROCESS): 'false'
+            ]))
+            (grailsApplication as DefaultGrailsApplication).config = new PropertySourcesConfig(propertySources)
+
             grailsLayoutHandlerMapping(GrailsLayoutHandlerMapping)
         }
     }

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 {
 

grails-gsp/grails-sitemesh3/src/main/groovy/org/grails/plugins/web/taglib/SitemeshTagLib.groovy

@@ -68,7 +68,6 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.ViewResolver;
 
-import org.grails.plugins.web.taglib.SitemeshTagLib;
 import org.grails.plugins.web.taglib.RenderTagLib;
 
 import jakarta.servlet.ServletContext;
@@ -241,7 +240,7 @@ public GrailsApplication grailsApplication() {
 
     protected static class TagLibraryLookupRegistrar implements ImportBeanDefinitionRegistrar {
 
-        public static final Class<?>[] DEFAULT_TAGLIB_CLASSES=new Class<?>[] { SitemeshTagLib.class, RenderTagLib.class, RenderSitemeshTagLib.class };
+        public static final Class<?>[] DEFAULT_TAGLIB_CLASSES=new Class<?>[] { RenderTagLib.class, RenderSitemeshTagLib.class };
 
         @Override
         public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {

grails-gsp/spring-boot/src/main/java/grails/gsp/boot/GspAutoConfiguration.java

@@ -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')

grails-test-examples/gsp-sitemesh3/src/integration-test/groovy/EndToEndSpec.groovy

@@ -58,7 +58,6 @@ public LazyTagLibraryLookup() {
         }
         if(ClassUtils.isPresent("org.grails.plugins.sitemesh3.Sitemesh3GrailsPlugin", classLoader)) {
             try {
-                mockedClasses.add(Class.forName("org.grails.plugins.web.taglib.SitemeshTagLib"));
                 mockedClasses.add(Class.forName("org.grails.plugins.web.taglib.RenderSitemeshTagLib"));
             }
             catch(Exception ignored) {