revert sitemesh3 upgrade & rename sitemesh -> layout to ensure license compliance

Author: jdaugherty

LICENSE

@@ -263,4 +263,11 @@ This product includes the following files from Spring Framework 5.3, developed b
 
 See the above Apache License 2.0 for the terms governing these files.
 
+--------------------------------------------------------------------------
+
+This product includes software developed by the OpenSymphony Group (http://www.opensymphony.com/). It uses Sitemesh2,
+licensed under the OpenSymphony Software License, Version 1.1.
+
+See licenses/LICENSE-opensymphony.txt for the full license terms.
+
 --------------------------------------------------------------------------

NOTICE

@@ -25,4 +25,7 @@ http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html
 
 This product includes software from Spring Framework 5.3, developed by Pivotal Software, Inc.
 Copyright 2002-2020 the original author or authors.
-See the LICENSE file for the Apache License 2.0 terms.
+See the LICENSE file for the Apache License 2.0 terms.
+
+This product includes software developed by the OpenSymphony Group (http://www.opensymphony.com/). It uses Sitemesh2,
+licensed under the OpenSymphony Software License, Version 1.1. See licenses/LICENSE-opensymphony.txt for the full license terms.

RENAME.md

@@ -121,7 +121,7 @@ Below is a reference of all migrated artifacts - both their old and new name.
 | org.grails.plugins                | scaffolding                                     | org.apache.grails                               | grails-scaffolding                                            |                        |                        | grails-views           |
 | 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                        | grails-plugin-sitemesh3                         | org.apache.grails                               | grails-sitemesh3                                              |                        |                        | grails-views           |
+| org.grails.plugins                | sitemesh2                                       | org.apache.grails                               | grails-layout                                                 |                        |                        | grails-gsp             |
 | 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 |

UPGRADE7.md

@@ -48,6 +48,5 @@ Experienced while upgrading modules for Grails 7
 
 ### Cool New Features
 - Hello Exterminator, Good by bugs! Lot's of things started working... and working well! For instance, use of controller namespaces now work seemlessly.
-- Massive decoupling of dependencies and cleanup between modules.  SiteMesh dependencies are no longer compiled into controllers fused between numerous modules. SiteMesh isn't even required to use Grails!
-- GSP can now be used OUTSIDE of Grails! see grails-boot
+- Massive decoupling of dependencies and cleanup between modules.
 - Works with Spring Security 6 out of the box. No plugin needed!

dependencies.gradle

@@ -93,6 +93,7 @@ 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
@@ -123,6 +124,7 @@ 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,9 @@ 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"
 )
   declare -a excluded_gsp_mappings=(
@@ -171,7 +173,9 @@ 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'"
   "exclude[[:space:]]+module[[:space:]]*:[[:space:]]*['\"]fields['\"]|exclude module:'grails-fields'"
   )

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,7 +67,7 @@ def publishedProjects = [
         'grails-scaffolding',
         'grails-services',
         'grails-shell-cli',
-        'grails-sitemesh3',
+        'grails-layout',
         'grails-spring',
         'grails-taglib',
         'grails-test-core',
@@ -87,6 +87,7 @@ def publishedProjects = [
         'grails-web-gsp',
         'grails-web-gsp-taglib',
         'grails-web-jsp',
+        'grails-web-layout',
         'grails-web-mvc',
         'grails-web-taglib',
         'grails-web-url-mappings',

grails-controllers/build.gradle

@@ -35,6 +35,7 @@ dependencies {
     api project(':grails-mimetypes')
     api project(':grails-validation')
     api project(':grails-domain-class')
+    api project(':grails-web-layout')
 
     api 'org.apache.groovy:groovy'
     api 'org.springframework.boot:spring-boot-autoconfigure'

grails-doc/src/en/guide/conf/config/builtInOptions.adoc

@@ -32,6 +32,6 @@ On the runtime front, i.e. `grails-app/conf/application.yml`, there are quite a
 * `grails.mime.file.extensions` - Whether to use the file extension to dictate the mime type in link:theWebLayer.html#contentNegotiation[Content Negotiation] (default: true).
 * `grails.mime.types` - A map of supported mime types used for link:theWebLayer.html#contentNegotiation[Content Negotiation].
 * `grails.serverURL` - A string specifying the server URL portion of absolute links, including server name e.g. grails.serverURL="http://my.yourportal.com". See link:{gspdocs}/ref/Tags/createLink.html[createLink]. Also used by redirects.
-* `grails.views.gsp.sitemesh.preprocess` - Determines whether SiteMesh preprocessing happens. Disabling this slows down page rendering, but if you need SiteMesh to parse the generated HTML from a GSP view then disabling it is the right option. Don't worry if you don't understand this advanced property: leave it set to true.
+* `grails.views.gsp.layout.preprocess` - Determines whether layout preprocessing happens. Disabling this slows down page rendering, but if you need Grail's layout implementation to parse the generated HTML from a GSP view then disabling it is the right option. Don't worry if you don't understand this advanced property: leave it set to true.
 * `grails.reload.excludes` and `grails.reload.includes` - Configuring these directives determines the reload behavior for project specific source files. Each directive takes a list of strings that are the class names for project source files that should be excluded from reloading behavior or included accordingly when running the application in development with the `bootRun` task. If the `grails.reload.includes` directive is configured, then only the classes in that list will be reloaded.