Merge pull request #301 from rainboyan/sitemesh_2_6

Upgrade to SiteMesh 2.6.0-M1 Closes gh-299
graceframework · Jun 11, 2024 · f0cef1f · f0cef1f
2 parents 0560b5a + ab16621
commit f0cef1f
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 473 deletions.
diff --git a/grace-web-gsp/src/main/groovy/org/grails/web/servlet/view/SitemeshLayoutViewResolver.java b/grace-web-gsp/src/main/groovy/org/grails/web/servlet/view/SitemeshLayoutViewResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,16 @@
  */
 package org.grails.web.servlet.view;
 
+import java.util.Collections;
 import java.util.Enumeration;
-import java.util.NoSuchElementException;
+import java.util.Map;
 
 import jakarta.servlet.FilterConfig;
 import jakarta.servlet.ServletContext;
 
 import com.opensymphony.module.sitemesh.Config;
 import com.opensymphony.module.sitemesh.Factory;
+import com.opensymphony.module.sitemesh.factory.DefaultFactory;
 import com.opensymphony.sitemesh.ContentProcessor;
 import com.opensymphony.sitemesh.compatability.PageParser2ContentProcessor;
 import org.springframework.beans.factory.DisposableBean;
@@ -36,7 +38,6 @@
 import grails.core.support.GrailsApplicationAware;
 
 import org.grails.web.sitemesh.FactoryHolder;
-import org.grails.web.sitemesh.Grails5535Factory;
 import org.grails.web.sitemesh.GroovyPageLayoutFinder;
 import org.grails.web.sitemesh.SitemeshLayoutView;
 
@@ -80,38 +81,33 @@ public void init() {
 
     protected Factory loadSitemeshConfig() {
         FilterConfig filterConfig = new FilterConfig() {
+            private final Map<String, String> customConfig =
+                    Collections.singletonMap("configFile",
+                            "classpath:org/grails/web/sitemesh/sitemesh-default.xml");
+
             @Override
             public ServletContext getServletContext() {
                 return servletContext;
             }
 
             @Override
             public Enumeration<String> getInitParameterNames() {
-                return new Enumeration<String>() {
-                    @Override
-                    public boolean hasMoreElements() {
-                        return false;
-                    }
-
-                    @Override
-                    public String nextElement() {
-                        throw new NoSuchElementException();
-                    }
-                };
+                return Collections.enumeration(this.customConfig.keySet());
             }
 
             @Override
             public String getInitParameter(String name) {
-                return null;
+                return this.customConfig.get(name);
             }
 
             @Override
             public String getFilterName() {
                 return null;
             }
         };
+
         Config config = new Config(filterConfig);
-        Grails5535Factory sitemeshFactory = new Grails5535Factory(config);
+        DefaultFactory sitemeshFactory = new DefaultFactory(config);
         if (servletContext != null) {
             servletContext.setAttribute(FACTORY_SERVLET_CONTEXT_ATTRIBUTE, sitemeshFactory);
         }

diff --git a/grace-web-sitemesh/build.gradle b/grace-web-sitemesh/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
     api libs.jakarta.servlet
-    api project(":grace-sitemesh")
+    api libs.sitemesh
     api project(":grace-web-common")
 
     testImplementation libs.spring.test