initial decouple of sitemesh2 from gsp & test reorganization

Author: jdaugherty

RENAME.md

@@ -122,6 +122,7 @@ Below is a reference of all migrated artifacts - both their old and new name.
 | org.grails | grails-plugin-services | org.apache.grails | grails-services | | | grails-core |
 | org.grails | grails-shell | org.apache.grails | grails-shell-cli | | | grails-core |
 | org.grails.plugins | sitemesh2 | org.apache.grails | grails-layout | | | grails-gsp |
+| org.grails | grails-plugin-sitemesh3 | org.apache.grails | grails-sitemesh3 | | | grails-views |
 | org.grails | grails-spring | org.apache.grails | grails-spring | | | grails-core |
 | org.grails.plugins | spring-security-acl | org.apache.grails | grails-spring-security-acl | | | grails-spring-security |
 | org.grails.plugins | spring-security-cas | org.apache.grails | grails-spring-security-cas | | | grails-spring-security |

dependencies.gradle

@@ -93,7 +93,6 @@ ext {
  'rxjava3.version' : '3.1.10',
  'selenium.version' : '4.25.0',
  'spock.version' : '2.3-groovy-4.0',
- 'sitemesh.version' : '2.6.0',
  ]
 
  // Note: the name of the dependency must be the prefix of the property name so properties in the pom are resolved correctly
@@ -124,7 +123,6 @@ ext {
  'rxjava' : "io.reactivex:rxjava:${bomDependencyVersions['rxjava.version']}",
  'rxjava2' : "io.reactivex.rxjava2:rxjava:${bomDependencyVersions['rxjava2.version']}",
  'rxjava3' : "io.reactivex.rxjava3:rxjava:${bomDependencyVersions['rxjava3.version']}",
- 'sitemesh' : "opensymphony:sitemesh:${bomDependencyVersions['sitemesh.version']}",
  ]
 
  // Because pom exclusions aren't properly supported by gradle, we can't inherit the grails-gradle-bom

etc/bin/rename_gradle_artifacts.sh

@@ -160,7 +160,7 @@ declare -a views_mappings=(
  "org[.]grails:grails-web-gsp-taglib|org.apache.grails.views:grails-web-gsp-taglib"
  "org[.]grails:grails-web-gsp|org.apache.grails.views:grails-web-gsp"
  "org[.]grails:grails-taglib|org.apache.grails.views:grails-taglib"
- #"org[.]grails:grails-plugin-sitemesh3|org.apache.grails:grails-sitemesh3"
+ "org[.]grails:grails-plugin-sitemesh3|org.apache.grails:grails-sitemesh3"
  "org[.]grails[.].plugins:sitemesh2|org.apache.grails:grails-layout"
  "org[.]grails:grails-web-sitemesh|org.apache.grails:grails-web-layout"
  "org[.]grails:grails-gsp|org.apache.grails.views:grails-gsp-core"
@@ -173,7 +173,7 @@ declare -a views_mappings=(
  "exclude[[:space:]]+module[[:space:]]*:[[:space:]]*['\"]scaffolding['\"]|exclude module:'grails-scaffolding'"
  "exclude[[:space:]]+module[[:space:]]*:[[:space:]]*['\"]gsp['\"]|exclude module:'grails-gsp'"
  "exclude[[:space:]]+module[[:space:]]*:[[:space:]]*['\"]grails-web-testing-support['\"]|exclude module:'grails-testing-support-web'"
- #"exclude[[:space:]]+module[[:space:]]*:[[:space:]]*['\"]grails-plugin-sitemesh3['\"]|exclude module:'grails-sitemesh3'"
+ "exclude[[:space:]]+module[[:space:]]*:[[:space:]]*['\"]grails-plugin-sitemesh3['\"]|exclude module:'grails-sitemesh3'"
  "exclude[[:space:]]+module[[:space:]]*:[[:space:]]*['\"]sitemesh2['\"]|exclude module:'grails-layout'"
  "exclude[[:space:]]+module[[:space:]]*:[[:space:]]*['\"]grails-web-sitemesh['\"]|exclude module:'grails-web-layout'"
  "exclude[[:space:]]+module[[:space:]]*:[[:space:]]*['\"]grails-gsp['\"]|exclude module:'grails-gsp-core'"

gradle.properties

@@ -35,7 +35,6 @@ joddWotVersion=3.3.8
 elApiVersion=5.0.1
 defaultElImplementationVersion=5.0.0
 jspApiVersion=4.0.0
-sitemeshVersion=3.2.2
 javassistVersion=3.30.2-GA
 yakworksHibernateGroovyProxyVersion=1.1
 picocliVersion=4.7.6

gradle/publish-root-config.gradle

@@ -67,6 +67,7 @@ def publishedProjects = [
  'grails-scaffolding',
  'grails-services',
  'grails-shell-cli',
+ 'grails-sitemesh3',
  'grails-layout',
  'grails-spring',
  'grails-taglib',

grails-doc/src/en/guide/upgrading/upgrading60x.adoc

@@ -320,8 +320,8 @@ Package Changes:
 * org.grails.web.sitemesh -> org.apache.grails.views.gsp.layout
 
 Notable Class Moves:
-* org.grails.web.servlet.view.GrailsLayoutViewResolver -> org.grails.web.servlet.view.EmbeddedGrailsLayoutViewResolver
-* org.grails.web.servlet.view.SitemeshLayoutViewResolver -> org.grails.web.servlet.view.GrailsLayoutViewResolver
+* org.grails.web.servlet.view.GrailsLayoutViewResolver -> org.apache.grails.web.layout.EmbeddedGrailsLayoutViewResolver
+* org.grails.web.servlet.view.SitemeshLayoutViewResolver -> org.apache.grails.web.layout.GrailsLayoutViewResolver
 * org.grails.web.sitemesh.GrailsLayoutView -> org.apache.grails.web.layout.EmbeddedGrailsLayoutView
 * org.grails.web.sitemesh.SitemeshLayoutView -> org.apache.grails.web.layout.GrailsLayoutView
 

grails-gsp/grails-web-layout/src/main/groovy/org/apache/grails/web/layout/GrailsRoutablePrintWriter.java renamed to grails-encoder/src/main/groovy/org/grails/buffer/GrailsRoutablePrintWriter.java

@@ -16,17 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.grails.web.layout;
+package org.grails.buffer;
 
 import groovy.lang.Writable;
 
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.Writer;
 
-import org.grails.buffer.GrailsPrintWriter;
-import org.grails.buffer.GrailsPrintWriterAdapter;
-import org.grails.buffer.StreamCharBuffer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.objenesis.ObjenesisStd;

grails-gsp/grails-sitemesh3/build.gradle

@@ -36,7 +36,7 @@ ext {
 dependencies {
 
  implementation platform(project(':grails-bom'))
- api "org.sitemesh:spring-boot-starter-sitemesh:$sitemeshVersion"
+ api "org.sitemesh:spring-boot-starter-sitemesh:3.2.2"
  api project(':grails-web-gsp-taglib')
 
 // api project(':grails-web-gsp'), { // GrailsConventionGroovyPageLocator

grails-gsp/grails-web-gsp/src/main/groovy/org/grails/web/pages/GSPResponseWriter.java

@@ -30,8 +30,7 @@
 import org.grails.encoder.Encoder;
 import org.grails.encoder.EncoderAware;
 import org.grails.web.servlet.mvc.GrailsWebRequest;
-import org.apache.grails.web.layout.GrailsContentBufferingResponse;
-import org.apache.grails.web.layout.GrailsRoutablePrintWriter;
+import org.grails.buffer.GrailsRoutablePrintWriter;
 import org.grails.web.util.BoundedCharsAsEncodedBytesCounter;
 import org.springframework.objenesis.ObjenesisStd;
 import org.springframework.objenesis.instantiator.ObjectInstantiator;
@@ -93,7 +92,7 @@ private static GSPResponseWriter getInstance(final ServletResponse response, fin
 
  final StreamCharBuffer.LazyInitializingWriter lazyResponseWriter = response::getWriter;
 
- if (!(response instanceof GrailsContentBufferingResponse)) {
+ if (!(response instanceof StreamCharBuffer.LazyInitializingWriter)) {
  streamBuffer.connectTo(new StreamCharBuffer.LazyInitializingMultipleWriter() {
  public Writer getWriter() {
  return null;

grails-gsp/grails-web-layout/build.gradle

@@ -35,7 +35,7 @@ dependencies {
  implementation platform(project(':grails-bom'))
  implementation 'org.apache.groovy:groovy'
 
- api 'opensymphony:sitemesh'
+ api 'opensymphony:sitemesh:2.6.0' // hard coded here since we support multiple versions
 
  compileOnly project(':grails-web-common')
  compileOnly 'jakarta.servlet:jakarta.servlet-api' // Provided