Upgrade to SiteMesh 2.7.0

Closes gh-1408

Author: rainboyan

grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GSPSitemeshPage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2025 the original author or authors.
+ * Copyright 2004-2026 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.
@@ -20,6 +20,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.opensymphony.module.sitemesh.DefaultSitemeshBuffer;
 import com.opensymphony.module.sitemesh.HTMLPage;
 import com.opensymphony.module.sitemesh.parser.AbstractHTMLPage;
 import com.opensymphony.sitemesh.Content;
@@ -58,6 +59,7 @@ public GSPSitemeshPage() {
     }
 
     public GSPSitemeshPage(boolean renderingLayout) {
+        super(new DefaultSitemeshBuffer(new char[0]));
         reset();
         this.renderingLayout = renderingLayout;
     }
@@ -148,10 +150,6 @@ public String getPage() {
         return null;
     }
 
-    public int originalLength() {
-        return this.pageBuffer.size();
-    }
-
     public void writeOriginal(Writer writer) throws IOException {
         writePage(writer);
     }

grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsContentBufferingResponse.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2025 the original author or authors.
+ * Copyright 2004-2026 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.
@@ -20,6 +20,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpServletResponseWrapper;
 
+import com.opensymphony.module.sitemesh.DefaultSitemeshBuffer;
 import com.opensymphony.module.sitemesh.PageParser;
 import com.opensymphony.module.sitemesh.PageParserSelector;
 import com.opensymphony.sitemesh.Content;
@@ -93,7 +94,7 @@ public Content getContent() throws IOException {
 
         char[] data = this.pageResponseWrapper.getContents();
         if (data != null && this.webAppContext.getContentType() != null) {
-            return this.contentProcessor.build(data, this.webAppContext);
+            return this.contentProcessor.build(new DefaultSitemeshBuffer(data), this.webAppContext);
         }
 
         return null;

grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsHTMLPageParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2025 the original author or authors.
+ * Copyright 2004-2026 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.
@@ -17,68 +17,19 @@
 
 import java.io.IOException;
 
-import com.opensymphony.module.sitemesh.Page;
-import com.opensymphony.module.sitemesh.html.HTMLProcessor;
-import com.opensymphony.module.sitemesh.html.State;
-import com.opensymphony.module.sitemesh.html.StateTransitionRule;
-import com.opensymphony.module.sitemesh.html.rules.BodyTagRule;
-import com.opensymphony.module.sitemesh.html.rules.ContentBlockExtractingRule;
-import com.opensymphony.module.sitemesh.html.rules.FramesetRule;
-import com.opensymphony.module.sitemesh.html.rules.HeadExtractingRule;
-import com.opensymphony.module.sitemesh.html.rules.HtmlAttributesRule;
-import com.opensymphony.module.sitemesh.html.rules.MSOfficeDocumentPropertiesRule;
-import com.opensymphony.module.sitemesh.html.rules.MetaTagRule;
-import com.opensymphony.module.sitemesh.html.rules.PageBuilder;
-import com.opensymphony.module.sitemesh.html.rules.ParameterExtractingRule;
-import com.opensymphony.module.sitemesh.html.rules.TitleExtractingRule;
-import com.opensymphony.module.sitemesh.html.util.CharArray;
+import com.opensymphony.module.sitemesh.SitemeshBuffer;
 import com.opensymphony.module.sitemesh.parser.HTMLPageParser;
 import com.opensymphony.module.sitemesh.parser.TokenizedHTMLPage;
 import com.opensymphony.sitemesh.Content;
 
 public class GrailsHTMLPageParser extends HTMLPageParser {
 
-    @Override
-    public Page parse(char[] data) throws IOException {
-        CharArray head = new CharArray(64);
-        CharArray body = new CharArray(4096);
-        TokenizedHTMLPage page = new TokenizedHTMLPage(data, body, head);
-        HTMLProcessor processor = new HTMLProcessor(data, body);
-        State html = processor.defaultState();
-
-        // Core rules for SiteMesh to be functional.
-        html.addRule(new HeadExtractingRule(head)); // contents of <head>
-        html.addRule(new BodyTagRule(page, body)); // contents of <body>
-        html.addRule(new TitleExtractingRule(page)); // the <title>
-        html.addRule(new FramesetRule(page)); // if the page is a frameset
-
-        // Additional rules - designed to be tweaked.
-        addUserDefinedRules(html, page);
-
-        processor.process();
-        return page;
-    }
-
     public Content parseContent(char[] data) throws IOException {
         return new TokenizedHTMLPage2Content((TokenizedHTMLPage) parse(data));
     }
 
-    @Override
-    protected void addUserDefinedRules(State html, PageBuilder page) {
-        // Ensure that while in <xml> tag, none of the other rules kick in.
-        // For example <xml><book><title>hello</title></book></xml> should not change the affect the title of the page.
-        State xml = new State();
-        html.addRule(new StateTransitionRule("xml", xml));
-
-        // Useful properties
-        html.addRule(new HtmlAttributesRule(page));         // attributes in <html> element
-        html.addRule(new MetaTagRule(page));                // all <meta> tags
-        html.addRule(new ParameterExtractingRule(page));    // <parameter> blocks
-        html.addRule(new ContentBlockExtractingRule(page)); // <content> blocks
-
-        // Capture properties written to documents by MS Office (author, version, company, etc).
-        // Note: These properties are from the xml state, not the html state.
-        xml.addRule(new MSOfficeDocumentPropertiesRule(page));
+    public Content parseContent(SitemeshBuffer buffer) throws IOException {
+        return new TokenizedHTMLPage2Content((TokenizedHTMLPage) parse(buffer));
     }
 
 }

grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsViewBufferingResponse.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2025 the original author or authors.
+ * Copyright 2014-2026 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.
@@ -20,6 +20,7 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
+import com.opensymphony.module.sitemesh.SitemeshBuffer;
 import com.opensymphony.sitemesh.Content;
 import com.opensymphony.sitemesh.ContentProcessor;
 import com.opensymphony.sitemesh.SiteMeshContext;
@@ -42,8 +43,8 @@ private static class SimpleWebAppContext extends SiteMeshWebAppContext {
     private static class SimpleHtmlOnlyContentProcessor implements ContentProcessor {
 
         @Override
-        public Content build(final char[] data, SiteMeshContext context) throws IOException {
-            return new GrailsHTMLPageParser().parseContent(data);
+        public Content build(SitemeshBuffer buffer, SiteMeshContext context) throws IOException {
+            return new GrailsHTMLPageParser().parseContent(buffer);
         }
 
         @Override

grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/TokenizedHTMLPage2Content.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2025 the original author or authors.
+ * Copyright 2014-2026 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.
@@ -44,11 +44,6 @@ public void writeBody(Writer out) throws IOException {
         this.page.writeBody(out);
     }
 
-    @Override
-    public int originalLength() {
-        return this.page.getContentLength();
-    }
-
     @Override
     public String getTitle() {
         return this.page.getTitle();

gradle/libs.versions.toml

@@ -60,7 +60,7 @@ rxjava2 = "2.2.21"
 rxjava3 = "3.1.12"
 selenium = "4.31.0"
 selenium-htmlunit = "4.30.0"
-sitemesh = "2.6.2"
+sitemesh = "2.7.0"
 slf4j = "2.0.17"
 snakeyaml = "2.4"
 spock = "2.3-groovy-4.0"