Consolidate 'grace-web-sitemesh' into 'grace-web-gsp'

rainboyan · rainboyan · commit c8ee8a529a92 · 2025-12-07T09:45:10.000+08:00
diff --git a/grace-plugin-gsp/build.gradle b/grace-plugin-gsp/build.gradle
@@ -6,7 +6,6 @@ dependencies {
     api project(":grace-plugin-codecs")
     api project(":grace-web-gsp")
     api project(":grace-web-mvc")
-    api project(":grace-web-sitemesh")
     api project(":grace-web-taglib")
     api project(":grace-web-url-mappings")
     api libs.spring.boot.autoconfigure
diff --git a/grace-web-gsp/build.gradle b/grace-web-gsp/build.gradle
@@ -1,8 +1,10 @@
 dependencies {
     api project(":grace-gsp")
     api project(":grace-web")
-    api project(":grace-web-sitemesh")
 
+    api libs.sitemesh, {
+        exclude module: 'jakarta.servlet-api'
+    }
     compileOnly libs.ant
     compileOnlyApi libs.jakarta.servlet
     // Required for JSP support
diff --git a/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/FactoryHolder.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/FactoryHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 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.
diff --git a/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GSPSitemeshPage.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GSPSitemeshPage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2022 the original author or authors.
+ * Copyright 2004-2025 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.
diff --git a/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsContentBufferingResponse.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsContentBufferingResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2023 the original author or authors.
+ * Copyright 2004-2025 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.
diff --git a/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsHTMLPageParser.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsHTMLPageParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2023 the original author or authors.
+ * Copyright 2004-2025 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.
diff --git a/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutDecoratorMapper.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutDecoratorMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2023 the original author or authors.
+ * Copyright 2004-2025 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.
diff --git a/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutView.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsLayoutView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2025 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.
diff --git a/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsNoDecorator.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsNoDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2024 the original author or authors.
+ * Copyright 2004-2025 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.
diff --git a/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsPageResponseWrapper.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsPageResponseWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2023 the original author or authors.
+ * Copyright 2004-2025 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.
diff --git a/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsRoutablePrintWriter.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsRoutablePrintWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2022 the original author or authors.
+ * Copyright 2004-2025 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.
diff --git a/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsViewBufferingResponse.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GrailsViewBufferingResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2025 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.
diff --git a/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GroovyPageLayoutFinder.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/GroovyPageLayoutFinder.java
diff --git a/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/SitemeshLayoutView.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/SitemeshLayoutView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2025 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.
diff --git a/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/SpringMVCViewDecorator.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/SpringMVCViewDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2023 the original author or authors.
+ * Copyright 2011-2025 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.
diff --git a/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/TokenizedHTMLPage2Content.java b/grace-web-gsp/src/main/groovy/org/grails/web/sitemesh/TokenizedHTMLPage2Content.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 the original author or authors.
+ * Copyright 2014-2025 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.
diff --git a/grace-web-gsp/src/main/resources/org/grails/web/sitemesh/sitemesh-default.xml b/grace-web-gsp/src/main/resources/org/grails/web/sitemesh/sitemesh-default.xml
diff --git a/grace-web-gsp/src/test/groovy/org/grails/web/sitemesh/GroovyPageLayoutFinderSpec.groovy b/grace-web-gsp/src/test/groovy/org/grails/web/sitemesh/GroovyPageLayoutFinderSpec.groovy
diff --git a/grace-web-sitemesh/README.md b/grace-web-sitemesh/README.md
diff --git a/grace-web-sitemesh/build.gradle b/grace-web-sitemesh/build.gradle
diff --git a/settings.gradle b/settings.gradle
@@ -31,10 +31,8 @@ include (
         'grace-views-json',
         'grace-views-markup',
         'grace-web',
-        // 'grace-web-common',
         'grace-web-gsp',
         'grace-web-mvc',
-        'grace-web-sitemesh',
         'grace-web-taglib',
         'grace-web-url-mappings',
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2006-2022 the original author or authors.`
	`2`	`+ * Copyright 2006-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2004-2022 the original author or authors.`
	`2`	`+ * Copyright 2004-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2004-2023 the original author or authors.`
	`2`	`+ * Copyright 2004-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2014-2023 the original author or authors.`
	`2`	`+ * Copyright 2014-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2004-2024 the original author or authors.`
	`2`	`+ * Copyright 2004-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`