Project clean up

* split sitemesh plugin & example application * add tests for sitemesh example application * fix API docs for classes not hosted in this project (see PageRenderer -> ApplicationContext) * repackage org.sitemesh.grails.plugins to org.grails.plugins * adopt grails-bom * remove common-build usage * doc cleanup * update minimum grails version * composite build switch * simplified docs build * adopt newer gradle features such as source jars, project.layout, moving away from ant, etc * update for grails-gradle plugin features in 7.0 * remove unneeded documentation scope
grails · Jan 11, 2025 · f804d85 · f804d85
1 parent 2451e07
commit f804d85
Show file tree

Hide file tree

Showing 220 changed files with 593 additions and 1,313 deletions.
diff --git a/build.gradle b/build.gradle
diff --git a/docs/build.gradle b/docs/build.gradle
@@ -0,0 +1,77 @@
+import grails.doc.gradle.PublishGuide
+
+buildscript {
+    repositories {
+        mavenLocal()
+        maven { url "https://repo.grails.org/grails/core" }
+    }
+    dependencies {
+        classpath platform("org.grails:grails-bom:$grailsVersion")
+        classpath "org.grails:grails-docs"
+    }
+}
+
+version rootProject.version
+
+apply plugin: 'groovy'
+
+//TODO: PublishGuide should eventually ensure the build directory exists
+tasks.register('docsBuild') {
+    doFirst {
+        project.layout.buildDirectory.get().asFile.mkdirs()
+    }
+
+    // Do not cache this task since the directory must exist if publishGuide is going to run
+    outputs.upToDateWhen { false }
+}
+
+tasks.register('publishGuide', PublishGuide) {
+    dependsOn 'docsBuild'
+
+    group = JavaBasePlugin.DOCUMENTATION_GROUP
+    description = 'Generate Guide'
+
+    targetDir = project.layout.buildDirectory.dir('docs').get().asFile
+    outputs.dir(targetDir) // ensure gradle understands what this task generates
+    sourceRepo = "https://github.com/grails/grails-gsp/edit/${githubBranch}/src/main/docs"
+    sourceDir = project.layout.projectDirectory.dir('src/main/docs').getAsFile()
+    inputs.dir(sourceDir) // ensure gradle understands what this task creates from
+    propertiesFiles = [rootProject.layout.projectDirectory.file('gradle.properties').asFile]
+    asciidoc = true
+    resourcesDir = project.file('src/main/docs/resources')
+    properties = [
+            'safe'          : 'UNSAFE', // Make sure any asciidoc security is disabled
+            'version'       : project.version,
+            'title'         : 'Groovy Server Pages (GSP)',
+            'subtitle'      : 'GSP (Groovy Server Pages) - A server-side view rendering technology based on Groovy',
+            // TODO: The javaee documentation has not been updated to jakarata
+            'javaee'        : 'https://docs.oracle.com/javaee/7/api/',
+            'jakartaee'     : 'https://jakarta.ee/specifications/platform/10/apidocs/',
+            'javase'        : 'https://docs.oracle.com/en/java/javase/17/docs/api/index.html',
+            'groovyapi'     : "https://docs.groovy-lang.org/$groovyVersion/html/gapi/",
+            'groovyjdk' : "https://docs.groovy-lang.org/$groovyVersion/html/groovy-jdk/",
+            'grailsapi'     : "https://docs.grails.org/$grailsVersion/api/",
+            'grailsdocs' : "https://docs.grails.org/$grailsVersion/",
+            'gormapi'       : 'http://gorm.grails.org/latest/api/',
+            'springapi'     : 'https://docs.spring.io/spring/docs/current/javadoc-api/',
+            'commandLineRef': "https://docs.grails.org/$grailsVersion/ref/Command%20Line",
+            'controllersRef': "https://docs.grails.org/$grailsVersion/ref/Controllers"
+    ] as Properties
+
+    doLast {
+        File destination = project.layout.buildDirectory.file("docs/guide/index.html").get().asFile
+        destination.delete()
+
+        project.layout.buildDirectory.file('docs/guide/single.html').get().asFile.renameTo(destination)
+        project.layout.buildDirectory.file('docs/index.html').get().asFile.text = '''
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+<meta http-equiv="refresh" content="0; url=guide/index.html" />
+</head>
+
+</body>
+</html>
+'''
+    }
+}
diff --git a/src/main/docs/guide/GSPBasics.adoc → docs/src/main/docs/guide/GSPBasics.adoc b/src/main/docs/guide/GSPBasics.adoc → docs/src/main/docs/guide/GSPBasics.adoc
diff --git a/...ain/docs/guide/GSPBasics/expressions.adoc → ...ain/docs/guide/GSPBasics/expressions.adoc b/...ain/docs/guide/GSPBasics/expressions.adoc → ...ain/docs/guide/GSPBasics/expressions.adoc
diff --git a/...cs/guide/GSPBasics/logicAndIteration.adoc → ...cs/guide/GSPBasics/logicAndIteration.adoc b/...cs/guide/GSPBasics/logicAndIteration.adoc → ...cs/guide/GSPBasics/logicAndIteration.adoc
diff --git a/.../docs/guide/GSPBasics/pageDirectives.adoc → .../docs/guide/GSPBasics/pageDirectives.adoc b/.../docs/guide/GSPBasics/pageDirectives.adoc → .../docs/guide/GSPBasics/pageDirectives.adoc
diff --git a/...s/guide/GSPBasics/variablesAndScopes.adoc → ...s/guide/GSPBasics/variablesAndScopes.adoc b/...s/guide/GSPBasics/variablesAndScopes.adoc → ...s/guide/GSPBasics/variablesAndScopes.adoc
diff --git a/src/main/docs/guide/introduction.adoc → docs/src/main/docs/guide/introduction.adoc b/src/main/docs/guide/introduction.adoc → docs/src/main/docs/guide/introduction.adoc
diff --git a/src/main/docs/guide/layouts.adoc → docs/src/main/docs/guide/layouts.adoc b/src/main/docs/guide/layouts.adoc → docs/src/main/docs/guide/layouts.adoc
diff --git a/.../makingChangesToADeployedApplication.adoc → .../makingChangesToADeployedApplication.adoc b/.../makingChangesToADeployedApplication.adoc → .../makingChangesToADeployedApplication.adoc
diff --git a/src/main/docs/guide/resources.adoc → docs/src/main/docs/guide/resources.adoc b/src/main/docs/guide/resources.adoc → docs/src/main/docs/guide/resources.adoc
diff --git a/...ain/docs/guide/sitemeshContentBlocks.adoc → ...ain/docs/guide/sitemeshContentBlocks.adoc b/...ain/docs/guide/sitemeshContentBlocks.adoc → ...ain/docs/guide/sitemeshContentBlocks.adoc
diff --git a/src/main/docs/guide/taglibs.adoc → docs/src/main/docs/guide/taglibs.adoc b/src/main/docs/guide/taglibs.adoc → docs/src/main/docs/guide/taglibs.adoc
diff --git a/...ain/docs/guide/taglibs/iterativeTags.adoc → ...ain/docs/guide/taglibs/iterativeTags.adoc b/...ain/docs/guide/taglibs/iterativeTags.adoc → ...ain/docs/guide/taglibs/iterativeTags.adoc
diff --git a/src/main/docs/guide/taglibs/logicalTags.adoc → .../main/docs/guide/taglibs/logicalTags.adoc b/src/main/docs/guide/taglibs/logicalTags.adoc → .../main/docs/guide/taglibs/logicalTags.adoc
diff --git a/src/main/docs/guide/taglibs/namespaces.adoc → ...c/main/docs/guide/taglibs/namespaces.adoc b/src/main/docs/guide/taglibs/namespaces.adoc → ...c/main/docs/guide/taglibs/namespaces.adoc
diff --git a/src/main/docs/guide/taglibs/simpleTags.adoc → ...c/main/docs/guide/taglibs/simpleTags.adoc b/src/main/docs/guide/taglibs/simpleTags.adoc → ...c/main/docs/guide/taglibs/simpleTags.adoc
diff --git a/...in/docs/guide/taglibs/tagReturnValue.adoc → ...in/docs/guide/taglibs/tagReturnValue.adoc b/...in/docs/guide/taglibs/tagReturnValue.adoc → ...in/docs/guide/taglibs/tagReturnValue.adoc
diff --git a/...ide/taglibs/taglibVariablesAndScopes.adoc → ...ide/taglibs/taglibVariablesAndScopes.adoc b/...ide/taglibs/taglibVariablesAndScopes.adoc → ...ide/taglibs/taglibVariablesAndScopes.adoc
diff --git a/...s/guide/taglibs/usingJSPTagLibraries.adoc → ...s/guide/taglibs/usingJSPTagLibraries.adoc b/...s/guide/taglibs/usingJSPTagLibraries.adoc → ...s/guide/taglibs/usingJSPTagLibraries.adoc
diff --git a/src/main/docs/guide/tags.adoc → docs/src/main/docs/guide/tags.adoc b/src/main/docs/guide/tags.adoc → docs/src/main/docs/guide/tags.adoc
diff --git a/src/main/docs/guide/tags/formsAndFields.adoc → .../main/docs/guide/tags/formsAndFields.adoc b/src/main/docs/guide/tags/formsAndFields.adoc → .../main/docs/guide/tags/formsAndFields.adoc
diff --git a/...in/docs/guide/tags/linksAndResources.adoc → ...in/docs/guide/tags/linksAndResources.adoc b/...in/docs/guide/tags/linksAndResources.adoc → ...in/docs/guide/tags/linksAndResources.adoc
diff --git a/...n/docs/guide/tags/searchAndFiltering.adoc → ...n/docs/guide/tags/searchAndFiltering.adoc b/...n/docs/guide/tags/searchAndFiltering.adoc → ...n/docs/guide/tags/searchAndFiltering.adoc
diff --git a/...docs/guide/tags/tagLogicAndIteration.adoc → ...docs/guide/tags/tagLogicAndIteration.adoc b/...docs/guide/tags/tagLogicAndIteration.adoc → ...docs/guide/tags/tagLogicAndIteration.adoc
diff --git a/...ocs/guide/tags/tagVariablesAndScopes.adoc → ...ocs/guide/tags/tagVariablesAndScopes.adoc b/...ocs/guide/tags/tagVariablesAndScopes.adoc → ...ocs/guide/tags/tagVariablesAndScopes.adoc
diff --git a/...in/docs/guide/tags/tagsAsMethodCalls.adoc → ...in/docs/guide/tags/tagsAsMethodCalls.adoc b/...in/docs/guide/tags/tagsAsMethodCalls.adoc → ...in/docs/guide/tags/tagsAsMethodCalls.adoc
diff --git a/src/main/docs/guide/toc.yml → docs/src/main/docs/guide/toc.yml b/src/main/docs/guide/toc.yml → docs/src/main/docs/guide/toc.yml
diff --git a/src/main/docs/guide/viewsAndTemplates.adoc → ...rc/main/docs/guide/viewsAndTemplates.adoc b/src/main/docs/guide/viewsAndTemplates.adoc → ...rc/main/docs/guide/viewsAndTemplates.adoc
diff --git a/src/main/docs/ref/Tag Libraries.adoc → docs/src/main/docs/ref/Tag Libraries.adoc b/src/main/docs/ref/Tag Libraries.adoc → docs/src/main/docs/ref/Tag Libraries.adoc
diff --git a/...in/docs/ref/Tag Libraries/actionName.adoc → ...in/docs/ref/Tag Libraries/actionName.adoc b/...in/docs/ref/Tag Libraries/actionName.adoc → ...in/docs/ref/Tag Libraries/actionName.adoc
diff --git a/...ocs/ref/Tag Libraries/controllerName.adoc → ...ocs/ref/Tag Libraries/controllerName.adoc b/...ocs/ref/Tag Libraries/controllerName.adoc → ...ocs/ref/Tag Libraries/controllerName.adoc
diff --git a/src/main/docs/ref/Tag Libraries/flash.adoc → ...rc/main/docs/ref/Tag Libraries/flash.adoc b/src/main/docs/ref/Tag Libraries/flash.adoc → ...rc/main/docs/ref/Tag Libraries/flash.adoc
diff --git a/...ain/docs/ref/Tag Libraries/pageScope.adoc → ...ain/docs/ref/Tag Libraries/pageScope.adoc b/...ain/docs/ref/Tag Libraries/pageScope.adoc → ...ain/docs/ref/Tag Libraries/pageScope.adoc
diff --git a/src/main/docs/ref/Tag Libraries/params.adoc → ...c/main/docs/ref/Tag Libraries/params.adoc b/src/main/docs/ref/Tag Libraries/params.adoc → ...c/main/docs/ref/Tag Libraries/params.adoc
diff --git a/src/main/docs/ref/Tag Libraries/request.adoc → .../main/docs/ref/Tag Libraries/request.adoc b/src/main/docs/ref/Tag Libraries/request.adoc → .../main/docs/ref/Tag Libraries/request.adoc
diff --git a/...main/docs/ref/Tag Libraries/response.adoc → ...main/docs/ref/Tag Libraries/response.adoc b/...main/docs/ref/Tag Libraries/response.adoc → ...main/docs/ref/Tag Libraries/response.adoc
diff --git a/...ocs/ref/Tag Libraries/servletContext.adoc → ...ocs/ref/Tag Libraries/servletContext.adoc b/...ocs/ref/Tag Libraries/servletContext.adoc → ...ocs/ref/Tag Libraries/servletContext.adoc
diff --git a/src/main/docs/ref/Tag Libraries/session.adoc → .../main/docs/ref/Tag Libraries/session.adoc b/src/main/docs/ref/Tag Libraries/session.adoc → .../main/docs/ref/Tag Libraries/session.adoc
diff --git a/src/main/docs/ref/Tags/actionSubmit.adoc → .../src/main/docs/ref/Tags/actionSubmit.adoc b/src/main/docs/ref/Tags/actionSubmit.adoc → .../src/main/docs/ref/Tags/actionSubmit.adoc
diff --git a/...main/docs/ref/Tags/actionSubmitImage.adoc → ...main/docs/ref/Tags/actionSubmitImage.adoc b/...main/docs/ref/Tags/actionSubmitImage.adoc → ...main/docs/ref/Tags/actionSubmitImage.adoc
diff --git a/src/main/docs/ref/Tags/applyLayout.adoc → docs/src/main/docs/ref/Tags/applyLayout.adoc b/src/main/docs/ref/Tags/applyLayout.adoc → docs/src/main/docs/ref/Tags/applyLayout.adoc
diff --git a/src/main/docs/ref/Tags/checkBox.adoc → docs/src/main/docs/ref/Tags/checkBox.adoc b/src/main/docs/ref/Tags/checkBox.adoc → docs/src/main/docs/ref/Tags/checkBox.adoc
diff --git a/src/main/docs/ref/Tags/collect.adoc → docs/src/main/docs/ref/Tags/collect.adoc b/src/main/docs/ref/Tags/collect.adoc → docs/src/main/docs/ref/Tags/collect.adoc
diff --git a/src/main/docs/ref/Tags/cookie.adoc → docs/src/main/docs/ref/Tags/cookie.adoc b/src/main/docs/ref/Tags/cookie.adoc → docs/src/main/docs/ref/Tags/cookie.adoc
diff --git a/src/main/docs/ref/Tags/country.adoc → docs/src/main/docs/ref/Tags/country.adoc b/src/main/docs/ref/Tags/country.adoc → docs/src/main/docs/ref/Tags/country.adoc
diff --git a/src/main/docs/ref/Tags/countrySelect.adoc → ...src/main/docs/ref/Tags/countrySelect.adoc b/src/main/docs/ref/Tags/countrySelect.adoc → ...src/main/docs/ref/Tags/countrySelect.adoc
diff --git a/src/main/docs/ref/Tags/createLink.adoc → docs/src/main/docs/ref/Tags/createLink.adoc b/src/main/docs/ref/Tags/createLink.adoc → docs/src/main/docs/ref/Tags/createLink.adoc
diff --git a/src/main/docs/ref/Tags/createLinkTo.adoc → .../src/main/docs/ref/Tags/createLinkTo.adoc b/src/main/docs/ref/Tags/createLinkTo.adoc → .../src/main/docs/ref/Tags/createLinkTo.adoc
diff --git a/src/main/docs/ref/Tags/currencySelect.adoc → ...rc/main/docs/ref/Tags/currencySelect.adoc b/src/main/docs/ref/Tags/currencySelect.adoc → ...rc/main/docs/ref/Tags/currencySelect.adoc
diff --git a/src/main/docs/ref/Tags/datePicker.adoc → docs/src/main/docs/ref/Tags/datePicker.adoc b/src/main/docs/ref/Tags/datePicker.adoc → docs/src/main/docs/ref/Tags/datePicker.adoc
diff --git a/src/main/docs/ref/Tags/each.adoc → docs/src/main/docs/ref/Tags/each.adoc b/src/main/docs/ref/Tags/each.adoc → docs/src/main/docs/ref/Tags/each.adoc
diff --git a/src/main/docs/ref/Tags/eachError.adoc → docs/src/main/docs/ref/Tags/eachError.adoc b/src/main/docs/ref/Tags/eachError.adoc → docs/src/main/docs/ref/Tags/eachError.adoc
diff --git a/src/main/docs/ref/Tags/else.adoc → docs/src/main/docs/ref/Tags/else.adoc b/src/main/docs/ref/Tags/else.adoc → docs/src/main/docs/ref/Tags/else.adoc
diff --git a/src/main/docs/ref/Tags/elseif.adoc → docs/src/main/docs/ref/Tags/elseif.adoc b/src/main/docs/ref/Tags/elseif.adoc → docs/src/main/docs/ref/Tags/elseif.adoc
diff --git a/src/main/docs/ref/Tags/external.adoc → docs/src/main/docs/ref/Tags/external.adoc b/src/main/docs/ref/Tags/external.adoc → docs/src/main/docs/ref/Tags/external.adoc
diff --git a/src/main/docs/ref/Tags/field.adoc → docs/src/main/docs/ref/Tags/field.adoc b/src/main/docs/ref/Tags/field.adoc → docs/src/main/docs/ref/Tags/field.adoc
diff --git a/src/main/docs/ref/Tags/fieldError.adoc → docs/src/main/docs/ref/Tags/fieldError.adoc b/src/main/docs/ref/Tags/fieldError.adoc → docs/src/main/docs/ref/Tags/fieldError.adoc
diff --git a/src/main/docs/ref/Tags/fieldValue.adoc → docs/src/main/docs/ref/Tags/fieldValue.adoc b/src/main/docs/ref/Tags/fieldValue.adoc → docs/src/main/docs/ref/Tags/fieldValue.adoc
diff --git a/src/main/docs/ref/Tags/findAll.adoc → docs/src/main/docs/ref/Tags/findAll.adoc b/src/main/docs/ref/Tags/findAll.adoc → docs/src/main/docs/ref/Tags/findAll.adoc
diff --git a/src/main/docs/ref/Tags/form.adoc → docs/src/main/docs/ref/Tags/form.adoc b/src/main/docs/ref/Tags/form.adoc → docs/src/main/docs/ref/Tags/form.adoc
diff --git a/src/main/docs/ref/Tags/formActionSubmit.adoc → .../main/docs/ref/Tags/formActionSubmit.adoc b/src/main/docs/ref/Tags/formActionSubmit.adoc → .../main/docs/ref/Tags/formActionSubmit.adoc
diff --git a/src/main/docs/ref/Tags/formatBoolean.adoc → ...src/main/docs/ref/Tags/formatBoolean.adoc b/src/main/docs/ref/Tags/formatBoolean.adoc → ...src/main/docs/ref/Tags/formatBoolean.adoc
diff --git a/src/main/docs/ref/Tags/formatDate.adoc → docs/src/main/docs/ref/Tags/formatDate.adoc b/src/main/docs/ref/Tags/formatDate.adoc → docs/src/main/docs/ref/Tags/formatDate.adoc
diff --git a/src/main/docs/ref/Tags/formatNumber.adoc → .../src/main/docs/ref/Tags/formatNumber.adoc b/src/main/docs/ref/Tags/formatNumber.adoc → .../src/main/docs/ref/Tags/formatNumber.adoc
diff --git a/src/main/docs/ref/Tags/grep.adoc → docs/src/main/docs/ref/Tags/grep.adoc b/src/main/docs/ref/Tags/grep.adoc → docs/src/main/docs/ref/Tags/grep.adoc
diff --git a/src/main/docs/ref/Tags/hasErrors.adoc → docs/src/main/docs/ref/Tags/hasErrors.adoc b/src/main/docs/ref/Tags/hasErrors.adoc → docs/src/main/docs/ref/Tags/hasErrors.adoc
diff --git a/src/main/docs/ref/Tags/header.adoc → docs/src/main/docs/ref/Tags/header.adoc b/src/main/docs/ref/Tags/header.adoc → docs/src/main/docs/ref/Tags/header.adoc
diff --git a/src/main/docs/ref/Tags/hiddenField.adoc → docs/src/main/docs/ref/Tags/hiddenField.adoc b/src/main/docs/ref/Tags/hiddenField.adoc → docs/src/main/docs/ref/Tags/hiddenField.adoc
diff --git a/src/main/docs/ref/Tags/if.adoc → docs/src/main/docs/ref/Tags/if.adoc b/src/main/docs/ref/Tags/if.adoc → docs/src/main/docs/ref/Tags/if.adoc
diff --git a/src/main/docs/ref/Tags/img.adoc → docs/src/main/docs/ref/Tags/img.adoc b/src/main/docs/ref/Tags/img.adoc → docs/src/main/docs/ref/Tags/img.adoc
diff --git a/src/main/docs/ref/Tags/include.adoc → docs/src/main/docs/ref/Tags/include.adoc b/src/main/docs/ref/Tags/include.adoc → docs/src/main/docs/ref/Tags/include.adoc
diff --git a/src/main/docs/ref/Tags/isAvailable.adoc → docs/src/main/docs/ref/Tags/isAvailable.adoc b/src/main/docs/ref/Tags/isAvailable.adoc → docs/src/main/docs/ref/Tags/isAvailable.adoc
diff --git a/src/main/docs/ref/Tags/isNotAvailable.adoc → ...rc/main/docs/ref/Tags/isNotAvailable.adoc b/src/main/docs/ref/Tags/isNotAvailable.adoc → ...rc/main/docs/ref/Tags/isNotAvailable.adoc
diff --git a/src/main/docs/ref/Tags/javascript.adoc → docs/src/main/docs/ref/Tags/javascript.adoc b/src/main/docs/ref/Tags/javascript.adoc → docs/src/main/docs/ref/Tags/javascript.adoc
diff --git a/src/main/docs/ref/Tags/join.adoc → docs/src/main/docs/ref/Tags/join.adoc b/src/main/docs/ref/Tags/join.adoc → docs/src/main/docs/ref/Tags/join.adoc
diff --git a/src/main/docs/ref/Tags/layoutBody.adoc → docs/src/main/docs/ref/Tags/layoutBody.adoc b/src/main/docs/ref/Tags/layoutBody.adoc → docs/src/main/docs/ref/Tags/layoutBody.adoc
diff --git a/src/main/docs/ref/Tags/layoutHead.adoc → docs/src/main/docs/ref/Tags/layoutHead.adoc b/src/main/docs/ref/Tags/layoutHead.adoc → docs/src/main/docs/ref/Tags/layoutHead.adoc
diff --git a/src/main/docs/ref/Tags/layoutTitle.adoc → docs/src/main/docs/ref/Tags/layoutTitle.adoc b/src/main/docs/ref/Tags/layoutTitle.adoc → docs/src/main/docs/ref/Tags/layoutTitle.adoc
diff --git a/src/main/docs/ref/Tags/link.adoc → docs/src/main/docs/ref/Tags/link.adoc b/src/main/docs/ref/Tags/link.adoc → docs/src/main/docs/ref/Tags/link.adoc
diff --git a/src/main/docs/ref/Tags/localeSelect.adoc → .../src/main/docs/ref/Tags/localeSelect.adoc b/src/main/docs/ref/Tags/localeSelect.adoc → .../src/main/docs/ref/Tags/localeSelect.adoc
diff --git a/src/main/docs/ref/Tags/message.adoc → docs/src/main/docs/ref/Tags/message.adoc b/src/main/docs/ref/Tags/message.adoc → docs/src/main/docs/ref/Tags/message.adoc
diff --git a/src/main/docs/ref/Tags/meta.adoc → docs/src/main/docs/ref/Tags/meta.adoc b/src/main/docs/ref/Tags/meta.adoc → docs/src/main/docs/ref/Tags/meta.adoc
diff --git a/src/main/docs/ref/Tags/pageProperty.adoc → .../src/main/docs/ref/Tags/pageProperty.adoc b/src/main/docs/ref/Tags/pageProperty.adoc → .../src/main/docs/ref/Tags/pageProperty.adoc
diff --git a/src/main/docs/ref/Tags/paginate.adoc → docs/src/main/docs/ref/Tags/paginate.adoc b/src/main/docs/ref/Tags/paginate.adoc → docs/src/main/docs/ref/Tags/paginate.adoc
diff --git a/src/main/docs/ref/Tags/passwordField.adoc → ...src/main/docs/ref/Tags/passwordField.adoc b/src/main/docs/ref/Tags/passwordField.adoc → ...src/main/docs/ref/Tags/passwordField.adoc
diff --git a/src/main/docs/ref/Tags/radio.adoc → docs/src/main/docs/ref/Tags/radio.adoc b/src/main/docs/ref/Tags/radio.adoc → docs/src/main/docs/ref/Tags/radio.adoc
diff --git a/src/main/docs/ref/Tags/radioGroup.adoc → docs/src/main/docs/ref/Tags/radioGroup.adoc b/src/main/docs/ref/Tags/radioGroup.adoc → docs/src/main/docs/ref/Tags/radioGroup.adoc
diff --git a/src/main/docs/ref/Tags/render.adoc → docs/src/main/docs/ref/Tags/render.adoc b/src/main/docs/ref/Tags/render.adoc → docs/src/main/docs/ref/Tags/render.adoc
diff --git a/src/main/docs/ref/Tags/renderErrors.adoc → .../src/main/docs/ref/Tags/renderErrors.adoc b/src/main/docs/ref/Tags/renderErrors.adoc → .../src/main/docs/ref/Tags/renderErrors.adoc
diff --git a/src/main/docs/ref/Tags/resource.adoc → docs/src/main/docs/ref/Tags/resource.adoc b/src/main/docs/ref/Tags/resource.adoc → docs/src/main/docs/ref/Tags/resource.adoc
diff --git a/src/main/docs/ref/Tags/select.adoc → docs/src/main/docs/ref/Tags/select.adoc b/src/main/docs/ref/Tags/select.adoc → docs/src/main/docs/ref/Tags/select.adoc
diff --git a/src/main/docs/ref/Tags/set.adoc → docs/src/main/docs/ref/Tags/set.adoc b/src/main/docs/ref/Tags/set.adoc → docs/src/main/docs/ref/Tags/set.adoc
diff --git a/src/main/docs/ref/Tags/sortableColumn.adoc → ...rc/main/docs/ref/Tags/sortableColumn.adoc b/src/main/docs/ref/Tags/sortableColumn.adoc → ...rc/main/docs/ref/Tags/sortableColumn.adoc
diff --git a/src/main/docs/ref/Tags/submitButton.adoc → .../src/main/docs/ref/Tags/submitButton.adoc b/src/main/docs/ref/Tags/submitButton.adoc → .../src/main/docs/ref/Tags/submitButton.adoc
diff --git a/src/main/docs/ref/Tags/textArea.adoc → docs/src/main/docs/ref/Tags/textArea.adoc b/src/main/docs/ref/Tags/textArea.adoc → docs/src/main/docs/ref/Tags/textArea.adoc
diff --git a/src/main/docs/ref/Tags/textField.adoc → docs/src/main/docs/ref/Tags/textField.adoc b/src/main/docs/ref/Tags/textField.adoc → docs/src/main/docs/ref/Tags/textField.adoc
diff --git a/src/main/docs/ref/Tags/timeZoneSelect.adoc → ...rc/main/docs/ref/Tags/timeZoneSelect.adoc b/src/main/docs/ref/Tags/timeZoneSelect.adoc → ...rc/main/docs/ref/Tags/timeZoneSelect.adoc
diff --git a/src/main/docs/ref/Tags/unless.adoc → docs/src/main/docs/ref/Tags/unless.adoc b/src/main/docs/ref/Tags/unless.adoc → docs/src/main/docs/ref/Tags/unless.adoc
diff --git a/src/main/docs/ref/Tags/uploadForm.adoc → docs/src/main/docs/ref/Tags/uploadForm.adoc b/src/main/docs/ref/Tags/uploadForm.adoc → docs/src/main/docs/ref/Tags/uploadForm.adoc
diff --git a/src/main/docs/ref/Tags/while.adoc → docs/src/main/docs/ref/Tags/while.adoc b/src/main/docs/ref/Tags/while.adoc → docs/src/main/docs/ref/Tags/while.adoc
diff --git a/src/main/docs/resources/style/layout.html → ...src/main/docs/resources/style/layout.html b/src/main/docs/resources/style/layout.html → ...src/main/docs/resources/style/layout.html
@@ -61,7 +61,6 @@
     <tr>
         <td id="col1">
             <div id="main" class="corner-all">
-
                 <div class="project">
                     <h1>${title.encodeAsHtml()}</h1>
                     <p></p>

diff --git a/examples/sitemesh3/README.md b/examples/sitemesh3/README.md
@@ -0,0 +1,8 @@
+# SiteMesh 3 Grails Plugin Example
+Example using the SiteMesh 3 Grails Plugin on how to use [SiteMesh 3](https://github.com/sitemesh/sitemesh3)
+
+## Want to See the Full Power for Sitemesh 3?
+Check out using SiteMesh 3 layouts on GSP and JSP pages, error pages, specifying layouts in controllers, and even applying multiple layouts to the same view!
+
+You can see a working example by running this plugin:
+```./gradlew bootRun```
diff --git a/examples/sitemesh3/build.gradle b/examples/sitemesh3/build.gradle
@@ -0,0 +1,78 @@
+buildscript {
+    repositories {
+        maven { url "https://repo.grails.org/grails/core" }
+    }
+    dependencies {
+        classpath platform("org.grails:grails-bom:$grailsVersion")
+        classpath "org.grails:grails-gradle-plugin"
+    }
+}
+
+plugins {
+    id "war"
+    id "com.bertramlabs.asset-pipeline" version "5.0.5"
+}
+
+apply plugin:"org.grails.grails-web"
+apply plugin:"org.grails.grails-gsp"
+apply plugin:"org.grails.grails-plugin"
+
+version '0.0.1'
+group 'org.sitemesh.grails.plugins.sitemesh3'
+
+apply plugin:"org.grails.grails-web"
+apply plugin:"org.grails.grails-gsp"
+
+dependencies {
+// for testing purposes
+//    implementation files('lib/sitemesh-3.1.0-SNAPSHOT.jar', 'lib/spring-boot-starter-sitemesh-3.1.0-SNAPSHOT-plain.jar')
+    console "org.grails:grails-console"
+
+    implementation "org.grails:grails-plugin-databinding"
+    implementation "org.grails:grails-plugin-i18n"
+    implementation "org.grails:grails-plugin-interceptors"
+    implementation "org.grails:grails-plugin-rest"
+    implementation "org.grails:grails-plugin-services"
+    implementation "org.grails:grails-plugin-url-mappings"
+    implementation "org.grails:grails-web-boot"
+    implementation project(':grails-plugin-gsp')
+    implementation project(':grails-plugin-sitemesh3')
+
+    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
+    runtimeOnly "com.h2database:h2"
+    runtimeOnly "org.apache.tomcat:tomcat-jdbc"
+    runtimeOnly "org.fusesource.jansi:jansi"
+    runtimeOnly "org.grails.plugins:hibernate5"
+    runtimeOnly "org.grails.plugins:scaffolding"
+    runtimeOnly "org.grails:grails-core"
+    runtimeOnly "org.grails:grails-logging"
+    runtimeOnly "org.springframework.boot:spring-boot-autoconfigure"
+    runtimeOnly "org.springframework.boot:spring-boot-starter-actuator"
+    runtimeOnly "org.springframework.boot:spring-boot-starter-logging"
+    runtimeOnly "org.springframework.boot:spring-boot-starter-tomcat"
+    runtimeOnly "org.springframework.boot:spring-boot-starter-validation"
+
+    runtimeOnly "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:$jstlVersion"
+    runtimeOnly "org.glassfish.web:jakarta.servlet.jsp.jstl:$jstlVersion"
+    runtimeOnly 'org.apache.tomcat.embed:tomcat-embed-jasper:10.1.0' // jsp example
+
+    testImplementation 'org.grails:grails-gorm-testing-support'
+    testImplementation 'org.grails:grails-web-testing-support'
+    testImplementation 'org.spockframework:spock-core'
+    integrationTestImplementation testFixtures ("org.grails.plugins:geb")
+}
+
+tasks.withType(Test) {
+    useJUnitPlatform()
+}
+
+assets {
+    minifyJs = true
+    minifyCss = true
+    packagePlugin = true
+}
+
+bootRun {
+    String springProfilesActive = 'spring.profiles.active'
+    systemProperty springProfilesActive, System.getProperty(springProfilesActive)
+}
diff --git a/...ails-app/assets/images/advancedgrails.svg → ...ails-app/assets/images/advancedgrails.svg b/...ails-app/assets/images/advancedgrails.svg → ...ails-app/assets/images/advancedgrails.svg
diff --git a/...assets/images/apple-touch-icon-retina.png → ...assets/images/apple-touch-icon-retina.png b/...assets/images/apple-touch-icon-retina.png → ...assets/images/apple-touch-icon-retina.png
diff --git a/...ls-app/assets/images/apple-touch-icon.png → ...ls-app/assets/images/apple-touch-icon.png b/...ls-app/assets/images/apple-touch-icon.png → ...ls-app/assets/images/apple-touch-icon.png
diff --git a/...rails-app/assets/images/documentation.svg → ...rails-app/assets/images/documentation.svg b/...rails-app/assets/images/documentation.svg → ...rails-app/assets/images/documentation.svg
diff --git a/...esh3/grails-app/assets/images/favicon.ico → ...esh3/grails-app/assets/images/favicon.ico b/...esh3/grails-app/assets/images/favicon.ico → ...esh3/grails-app/assets/images/favicon.ico
diff --git a/...ets/images/grails-cupsonly-logo-white.svg → ...ets/images/grails-cupsonly-logo-white.svg b/...ets/images/grails-cupsonly-logo-white.svg → ...ets/images/grails-cupsonly-logo-white.svg
diff --git a/...mesh3/grails-app/assets/images/grails.svg → ...mesh3/grails-app/assets/images/grails.svg b/...mesh3/grails-app/assets/images/grails.svg → ...mesh3/grails-app/assets/images/grails.svg
diff --git a/...s-app/assets/images/skin/database_add.png → ...s-app/assets/images/skin/database_add.png b/...s-app/assets/images/skin/database_add.png → ...s-app/assets/images/skin/database_add.png
diff --git a/...pp/assets/images/skin/database_delete.png → ...pp/assets/images/skin/database_delete.png b/...pp/assets/images/skin/database_delete.png → ...pp/assets/images/skin/database_delete.png
diff --git a/...-app/assets/images/skin/database_edit.png → ...-app/assets/images/skin/database_edit.png b/...-app/assets/images/skin/database_edit.png → ...-app/assets/images/skin/database_edit.png
diff --git a/...-app/assets/images/skin/database_save.png → ...-app/assets/images/skin/database_save.png b/...-app/assets/images/skin/database_save.png → ...-app/assets/images/skin/database_save.png
diff --git a/...app/assets/images/skin/database_table.png → ...app/assets/images/skin/database_table.png b/...app/assets/images/skin/database_table.png → ...app/assets/images/skin/database_table.png
diff --git a/...ls-app/assets/images/skin/exclamation.png → ...ls-app/assets/images/skin/exclamation.png b/...ls-app/assets/images/skin/exclamation.png → ...ls-app/assets/images/skin/exclamation.png
diff --git a/...3/grails-app/assets/images/skin/house.png → ...3/grails-app/assets/images/skin/house.png b/...3/grails-app/assets/images/skin/house.png → ...3/grails-app/assets/images/skin/house.png
diff --git a/...ls-app/assets/images/skin/information.png → ...ls-app/assets/images/skin/information.png b/...ls-app/assets/images/skin/information.png → ...ls-app/assets/images/skin/information.png
diff --git a/...ils-app/assets/images/skin/sorted_asc.gif → ...ils-app/assets/images/skin/sorted_asc.gif b/...ils-app/assets/images/skin/sorted_asc.gif → ...ils-app/assets/images/skin/sorted_asc.gif
diff --git a/...ls-app/assets/images/skin/sorted_desc.gif → ...ls-app/assets/images/skin/sorted_desc.gif b/...ls-app/assets/images/skin/sorted_desc.gif → ...ls-app/assets/images/skin/sorted_desc.gif
diff --git a/...emesh3/grails-app/assets/images/slack.svg → ...emesh3/grails-app/assets/images/slack.svg b/...emesh3/grails-app/assets/images/slack.svg → ...emesh3/grails-app/assets/images/slack.svg
diff --git a/...esh3/grails-app/assets/images/spinner.gif → ...esh3/grails-app/assets/images/spinner.gif b/...esh3/grails-app/assets/images/spinner.gif → ...esh3/grails-app/assets/images/spinner.gif
diff --git a/...ils-app/assets/javascripts/application.js → ...ils-app/assets/javascripts/application.js b/...ils-app/assets/javascripts/application.js → ...ils-app/assets/javascripts/application.js
diff --git a/...pp/assets/javascripts/bootstrap.bundle.js → ...pp/assets/javascripts/bootstrap.bundle.js b/...pp/assets/javascripts/bootstrap.bundle.js → ...pp/assets/javascripts/bootstrap.bundle.js
diff --git a/...ssets/javascripts/bootstrap.bundle.js.map → ...ssets/javascripts/bootstrap.bundle.js.map b/...ssets/javascripts/bootstrap.bundle.js.map → ...ssets/javascripts/bootstrap.bundle.js.map
diff --git a/...ssets/javascripts/bootstrap.bundle.min.js → ...ssets/javascripts/bootstrap.bundle.min.js b/...ssets/javascripts/bootstrap.bundle.min.js → ...ssets/javascripts/bootstrap.bundle.min.js
diff --git a/...s/javascripts/bootstrap.bundle.min.js.map → ...s/javascripts/bootstrap.bundle.min.js.map b/...s/javascripts/bootstrap.bundle.min.js.map → ...s/javascripts/bootstrap.bundle.min.js.map
diff --git a/...rails-app/assets/javascripts/bootstrap.js → ...rails-app/assets/javascripts/bootstrap.js b/...rails-app/assets/javascripts/bootstrap.js → ...rails-app/assets/javascripts/bootstrap.js
diff --git a/...s-app/assets/javascripts/bootstrap.js.map → ...s-app/assets/javascripts/bootstrap.js.map b/...s-app/assets/javascripts/bootstrap.js.map → ...s-app/assets/javascripts/bootstrap.js.map
diff --git a/...s-app/assets/javascripts/bootstrap.min.js → ...s-app/assets/javascripts/bootstrap.min.js b/...s-app/assets/javascripts/bootstrap.min.js → ...s-app/assets/javascripts/bootstrap.min.js
diff --git a/...p/assets/javascripts/bootstrap.min.js.map → ...p/assets/javascripts/bootstrap.min.js.map b/...p/assets/javascripts/bootstrap.min.js.map → ...p/assets/javascripts/bootstrap.min.js.map
diff --git a/...ls-app/assets/javascripts/jquery-3.5.1.js → ...ls-app/assets/javascripts/jquery-3.5.1.js b/...ls-app/assets/javascripts/jquery-3.5.1.js → ...ls-app/assets/javascripts/jquery-3.5.1.js
diff --git a/...pp/assets/javascripts/jquery-3.5.1.min.js → ...pp/assets/javascripts/jquery-3.5.1.min.js b/...pp/assets/javascripts/jquery-3.5.1.min.js → ...pp/assets/javascripts/jquery-3.5.1.min.js
diff --git a/...ssets/javascripts/jquery-3.5.1.min.js.map → ...ssets/javascripts/jquery-3.5.1.min.js.map b/...ssets/javascripts/jquery-3.5.1.min.js.map → ...ssets/javascripts/jquery-3.5.1.min.js.map
diff --git a/...3/grails-app/assets/javascripts/popper.js → ...3/grails-app/assets/javascripts/popper.js b/...3/grails-app/assets/javascripts/popper.js → ...3/grails-app/assets/javascripts/popper.js
diff --git a/...ails-app/assets/javascripts/popper.min.js → ...ails-app/assets/javascripts/popper.min.js b/...ails-app/assets/javascripts/popper.min.js → ...ails-app/assets/javascripts/popper.min.js
diff --git a/...-app/assets/javascripts/popper.min.js.map → ...-app/assets/javascripts/popper.min.js.map b/...-app/assets/javascripts/popper.min.js.map → ...-app/assets/javascripts/popper.min.js.map
diff --git a/...ls-app/assets/stylesheets/application.css → ...ls-app/assets/stylesheets/application.css b/...ls-app/assets/stylesheets/application.css → ...ls-app/assets/stylesheets/application.css
diff --git a/...app/assets/stylesheets/bootstrap-grid.css → ...app/assets/stylesheets/bootstrap-grid.css b/...app/assets/stylesheets/bootstrap-grid.css → ...app/assets/stylesheets/bootstrap-grid.css
diff --git a/...assets/stylesheets/bootstrap-grid.css.map → ...assets/stylesheets/bootstrap-grid.css.map b/...assets/stylesheets/bootstrap-grid.css.map → ...assets/stylesheets/bootstrap-grid.css.map
diff --git a/...assets/stylesheets/bootstrap-grid.min.css → ...assets/stylesheets/bootstrap-grid.min.css b/...assets/stylesheets/bootstrap-grid.min.css → ...assets/stylesheets/bootstrap-grid.min.css
diff --git a/...ts/stylesheets/bootstrap-grid.min.css.map → ...ts/stylesheets/bootstrap-grid.min.css.map b/...ts/stylesheets/bootstrap-grid.min.css.map → ...ts/stylesheets/bootstrap-grid.min.css.map
diff --git a/...p/assets/stylesheets/bootstrap-reboot.css → ...p/assets/stylesheets/bootstrap-reboot.css b/...p/assets/stylesheets/bootstrap-reboot.css → ...p/assets/stylesheets/bootstrap-reboot.css
diff --git a/...ails-app/assets/stylesheets/bootstrap.css → ...ails-app/assets/stylesheets/bootstrap.css b/...ails-app/assets/stylesheets/bootstrap.css → ...ails-app/assets/stylesheets/bootstrap.css
diff --git a/...-app/assets/stylesheets/bootstrap.css.map → ...-app/assets/stylesheets/bootstrap.css.map b/...-app/assets/stylesheets/bootstrap.css.map → ...-app/assets/stylesheets/bootstrap.css.map
diff --git a/...-app/assets/stylesheets/bootstrap.min.css → ...-app/assets/stylesheets/bootstrap.min.css b/...-app/assets/stylesheets/bootstrap.min.css → ...-app/assets/stylesheets/bootstrap.min.css
diff --git a/.../assets/stylesheets/bootstrap.min.css.map → .../assets/stylesheets/bootstrap.min.css.map b/.../assets/stylesheets/bootstrap.min.css.map → .../assets/stylesheets/bootstrap.min.css.map
diff --git a/.../grails-app/assets/stylesheets/errors.css → .../grails-app/assets/stylesheets/errors.css b/.../grails-app/assets/stylesheets/errors.css → .../grails-app/assets/stylesheets/errors.css
diff --git a/.../grails-app/assets/stylesheets/grails.css → .../grails-app/assets/stylesheets/grails.css b/.../grails-app/assets/stylesheets/grails.css → .../grails-app/assets/stylesheets/grails.css
diff --git a/...h3/grails-app/assets/stylesheets/main.css → ...h3/grails-app/assets/stylesheets/main.css b/...h3/grails-app/assets/stylesheets/main.css → ...h3/grails-app/assets/stylesheets/main.css
diff --git a/.../grails-app/assets/stylesheets/mobile.css → .../grails-app/assets/stylesheets/mobile.css b/.../grails-app/assets/stylesheets/mobile.css → .../grails-app/assets/stylesheets/mobile.css
diff --git a/...sitemesh3/grails-app/conf/application.yml → ...sitemesh3/grails-app/conf/application.yml b/...sitemesh3/grails-app/conf/application.yml → ...sitemesh3/grails-app/conf/application.yml
diff --git a/...emesh3/grails-app/conf/logback-spring.xml → ...emesh3/grails-app/conf/logback-spring.xml b/...emesh3/grails-app/conf/logback-spring.xml → ...emesh3/grails-app/conf/logback-spring.xml
diff --git a/...s/plugins/sitemesh3/DemoController.groovy → ...s/plugins/sitemesh3/DemoController.groovy b/...s/plugins/sitemesh3/DemoController.groovy → ...s/plugins/sitemesh3/DemoController.groovy
diff --git a/...ails/plugins/sitemesh3/UrlMappings.groovy → ...ails/plugins/sitemesh3/UrlMappings.groovy b/...ails/plugins/sitemesh3/UrlMappings.groovy → ...ails/plugins/sitemesh3/UrlMappings.groovy
diff --git a/...mesh3/grails-app/i18n/messages.properties → ...mesh3/grails-app/i18n/messages.properties b/...mesh3/grails-app/i18n/messages.properties → ...mesh3/grails-app/i18n/messages.properties
diff --git a/...h3/grails-app/i18n/messages_cs.properties → ...h3/grails-app/i18n/messages_cs.properties b/...h3/grails-app/i18n/messages_cs.properties → ...h3/grails-app/i18n/messages_cs.properties
diff --git a/...h3/grails-app/i18n/messages_da.properties → ...h3/grails-app/i18n/messages_da.properties b/...h3/grails-app/i18n/messages_da.properties → ...h3/grails-app/i18n/messages_da.properties
diff --git a/...h3/grails-app/i18n/messages_de.properties → ...h3/grails-app/i18n/messages_de.properties b/...h3/grails-app/i18n/messages_de.properties → ...h3/grails-app/i18n/messages_de.properties
diff --git a/...h3/grails-app/i18n/messages_es.properties → ...h3/grails-app/i18n/messages_es.properties b/...h3/grails-app/i18n/messages_es.properties → ...h3/grails-app/i18n/messages_es.properties
diff --git a/...h3/grails-app/i18n/messages_fr.properties → ...h3/grails-app/i18n/messages_fr.properties b/...h3/grails-app/i18n/messages_fr.properties → ...h3/grails-app/i18n/messages_fr.properties
diff --git a/...h3/grails-app/i18n/messages_it.properties → ...h3/grails-app/i18n/messages_it.properties b/...h3/grails-app/i18n/messages_it.properties → ...h3/grails-app/i18n/messages_it.properties
diff --git a/...h3/grails-app/i18n/messages_ja.properties → ...h3/grails-app/i18n/messages_ja.properties b/...h3/grails-app/i18n/messages_ja.properties → ...h3/grails-app/i18n/messages_ja.properties
diff --git a/...h3/grails-app/i18n/messages_nb.properties → ...h3/grails-app/i18n/messages_nb.properties b/...h3/grails-app/i18n/messages_nb.properties → ...h3/grails-app/i18n/messages_nb.properties
diff --git a/...h3/grails-app/i18n/messages_nl.properties → ...h3/grails-app/i18n/messages_nl.properties b/...h3/grails-app/i18n/messages_nl.properties → ...h3/grails-app/i18n/messages_nl.properties
diff --git a/...h3/grails-app/i18n/messages_pl.properties → ...h3/grails-app/i18n/messages_pl.properties b/...h3/grails-app/i18n/messages_pl.properties → ...h3/grails-app/i18n/messages_pl.properties
diff --git a/...grails-app/i18n/messages_pt_BR.properties → ...grails-app/i18n/messages_pt_BR.properties b/...grails-app/i18n/messages_pt_BR.properties → ...grails-app/i18n/messages_pt_BR.properties
diff --git a/...grails-app/i18n/messages_pt_PT.properties → ...grails-app/i18n/messages_pt_PT.properties b/...grails-app/i18n/messages_pt_PT.properties → ...grails-app/i18n/messages_pt_PT.properties
diff --git a/...h3/grails-app/i18n/messages_ru.properties → ...h3/grails-app/i18n/messages_ru.properties b/...h3/grails-app/i18n/messages_ru.properties → ...h3/grails-app/i18n/messages_ru.properties
diff --git a/...h3/grails-app/i18n/messages_sk.properties → ...h3/grails-app/i18n/messages_sk.properties b/...h3/grails-app/i18n/messages_sk.properties → ...h3/grails-app/i18n/messages_sk.properties
diff --git a/...h3/grails-app/i18n/messages_sv.properties → ...h3/grails-app/i18n/messages_sv.properties b/...h3/grails-app/i18n/messages_sv.properties → ...h3/grails-app/i18n/messages_sv.properties
diff --git a/...h3/grails-app/i18n/messages_th.properties → ...h3/grails-app/i18n/messages_th.properties b/...h3/grails-app/i18n/messages_th.properties → ...h3/grails-app/i18n/messages_th.properties
diff --git a/...grails-app/i18n/messages_zh_CN.properties → ...grails-app/i18n/messages_zh_CN.properties b/...grails-app/i18n/messages_zh_CN.properties → ...grails-app/i18n/messages_zh_CN.properties
diff --git a/...ails/plugins/sitemesh3/Application.groovy → ...ails/plugins/sitemesh3/Application.groovy b/...ails/plugins/sitemesh3/Application.groovy → ...ails/plugins/sitemesh3/Application.groovy
diff --git a/...emesh3/grails-app/views/demo/chaining.gsp → ...emesh3/grails-app/views/demo/chaining.gsp b/...emesh3/grails-app/views/demo/chaining.gsp → ...emesh3/grails-app/views/demo/chaining.gsp
diff --git a/...sitemesh3/grails-app/views/demo/index.gsp → ...sitemesh3/grails-app/views/demo/index.gsp b/...sitemesh3/grails-app/views/demo/index.gsp → ...sitemesh3/grails-app/views/demo/index.gsp
diff --git a/...3/grails-app/views/demo/viewException.gsp → ...3/grails-app/views/demo/viewException.gsp b/...3/grails-app/views/demo/viewException.gsp → ...3/grails-app/views/demo/viewException.gsp
diff --git a/...ugin-sitemesh3/grails-app/views/error.gsp → ...ples/sitemesh3/grails-app/views/error.gsp b/...ugin-sitemesh3/grails-app/views/error.gsp → ...ples/sitemesh3/grails-app/views/error.gsp
@@ -23,9 +23,17 @@
             </g:else>
         </g:if>
         <g:else>
-            <ul class="errors">
-                <li>An error has occurred</li>
-            </ul>
+            <g:if test="${Throwable.isInstance(exception)}">
+                ${(exception as Throwable).message}
+            </g:if>
+            <g:elseif test="${request.getAttribute('jakarta.servlet.error.exception')}">
+                ${(request.getAttribute('jakarta.servlet.error.exception') as Throwable).message}
+            </g:elseif>
+            <g:else>
+                <ul class="errors">
+                    <li>An error has occurred</li>
+                </ul>
+            </g:else>
         </g:else>
     </body>
 </html>
diff --git a/...ugin-sitemesh3/grails-app/views/index.gsp → ...ples/sitemesh3/grails-app/views/index.gsp b/...ugin-sitemesh3/grails-app/views/index.gsp → ...ples/sitemesh3/grails-app/views/index.gsp
diff --git a/...3/grails-app/views/layouts/bootstrap5.gsp → ...3/grails-app/views/layouts/bootstrap5.gsp b/...3/grails-app/views/layouts/bootstrap5.gsp → ...3/grails-app/views/layouts/bootstrap5.gsp
diff --git a/...temesh3/grails-app/views/layouts/main.gsp → ...temesh3/grails-app/views/layouts/main.gsp b/...temesh3/grails-app/views/layouts/main.gsp → ...temesh3/grails-app/views/layouts/main.gsp
diff --git a/...emesh3/grails-app/views/layouts/modal.gsp → ...emesh3/grails-app/views/layouts/modal.gsp b/...emesh3/grails-app/views/layouts/modal.gsp → ...emesh3/grails-app/views/layouts/modal.gsp
diff --git a/...n-sitemesh3/grails-app/views/notFound.gsp → ...s/sitemesh3/grails-app/views/notFound.gsp b/...n-sitemesh3/grails-app/views/notFound.gsp → ...s/sitemesh3/grails-app/views/notFound.gsp
diff --git a/grails-plugin-sitemesh3/grails-cli.yml → examples/sitemesh3/grails-cli.yml b/grails-plugin-sitemesh3/grails-cli.yml → examples/sitemesh3/grails-cli.yml
diff --git a/examples/sitemesh3/src/integration-test/groovy/SitemeshSpec.groovy b/examples/sitemesh3/src/integration-test/groovy/SitemeshSpec.groovy
@@ -0,0 +1,90 @@
+import geb.navigator.DefaultNavigator
+import grails.plugin.geb.ContainerGebConfiguration
+import grails.plugin.geb.ContainerGebSpec
+import grails.testing.mixin.integration.Integration
+
+@Integration
+@ContainerGebConfiguration
+class SitemeshSpec extends ContainerGebSpec {
+
+    void "forced layout"() {
+        when:
+        browser.go 'demo/index'
+
+        then:
+        def container = $('div.container')
+        container
+
+        container.getAttribute("innerHTML").trim() == '''<h1>SiteMesh Example Site: Layout from Controller Demo</h1>
+    
+    Do you like BootStrap?
+
+    <footer>Note: this demo requires an internet connection for BootStrap to show up.</footer>'''
+    }
+
+    void "decorator chaining"() {
+        when:
+        browser.go 'demo/chaining'
+
+        then:
+        def container = $('div.container')
+        container
+
+        container.getAttribute("innerHTML").trim() == '''<h1>SiteMesh Example Site: Layout Chaining Demo</h1>
+    
+    This is so cool.
+
+    <footer>Note: this demo requires an internet connection for BootStrap to show up.</footer>'''
+    }
+
+    void "jsp demo"() {
+        when:
+        browser.go 'demo/jsp'
+
+        then:
+        def container = $('div.container')
+        container
+
+        container.firstElement().getAttribute("innerHTML").trim() == '''<h1>SiteMesh Example Site: Hello World</h1>
+    
+    <div id="content" role="main">
+        <div class="container">
+            <h1>Hello World, I am a JSP page!</h1>
+        </div>
+    </div>
+
+    <footer>Note: this demo requires an internet connection for BootStrap to show up.</footer>'''
+    }
+
+    void "text"() {
+        when:
+        browser.go 'demo/renderText'
+
+        then:
+        downloadText() == '''<p>Hello World</p>'''
+    }
+
+    void "Controller 500 Example"() {
+        when:
+        browser.go 'demo/exception'
+
+        then:
+        browser.driver.pageSource.contains('Whoops, why would you ever want to see an exception??')
+    }
+
+    void "View 500 Example"() {
+        when:
+        browser.go 'demo/viewException'
+
+        then:
+        browser.driver.pageSource.contains('Oh Man, this view sucks!')
+    }
+
+    void "404 Error"() {
+        when:
+        browser.go 'demo/404'
+
+        then:
+        browser.driver.pageSource.contains('Error: Page Not Found (404)')
+    }
+}
diff --git a/...p/WEB-INF/grails-app/views/demo/hello.jsp → ...p/WEB-INF/grails-app/views/demo/hello.jsp b/...p/WEB-INF/grails-app/views/demo/hello.jsp → ...p/WEB-INF/grails-app/views/demo/hello.jsp
diff --git a/gradle.properties b/gradle.properties
@@ -1,27 +1,19 @@
-title=Groovy Server Pages (GSP)
-authors=Puneet Behl
-projectVersion=7.0.0-M1
-projectDesc=GSP (Groovy Server Pages) - A server-side view rendering technology based on Groovy
-projectUrl=https://github.com/grails/grails-gsp
-githubSlug=grails/grails-gsp
-githubBranch=7.0.x
-developers=Puneet Behl, Graeme Rocher
+projectVersion=7.0.0-SNAPSHOT
+
+# for docs
+githubBranch = 7.0.x
 
 commonsTextVersion=1.13.0
 elApiVersion=6.0.1
-grailsGradlePluginVersion=7.0.0-SNAPSHOT
-grailsVersion=7.0.0-M1
+grailsVersion=7.0.0-SNAPSHOT
 groovyVersion=4.0.24
 jspApiVersion=4.0.0
 jstlVersion=3.0.1
-servletApiVersion=6.0.0
-sitemeshVersion=7.0.0-M1
-controllersRef=https://docs.grails.org/latest/ref/Controllers
-commandLineRef=https://docs.grails.org/latest/ref/Command%20Line
-grailsDocsVersion=7.0.0-SNAPSHOT
-testingSupportVersion=4.0.0-SNAPSHOT
-junit-jupiter.version=5.8.0
+sitemeshLibraryVersion=3.2.2
+
+slf4jPreventExclusion=true
 
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.daemon=true
+org.gradle.jvmArgs=-Dfile.encoding=UTF-8 -Xmx1024M
diff --git a/gradle/aggregate-groovydoc.gradle b/gradle/aggregate-groovydoc.gradle
@@ -0,0 +1,30 @@
+
+tasks.register('cleanDocs', Delete) {
+    delete rootProject.layout.buildDirectory.dir('docs')
+}
+
+tasks.register('aggregateGroovydoc', Groovydoc) {
+    def groovyDocProjects = rootProject.subprojects.findAll { it.name != 'docs' && !it.name.startsWith('examples') }.findAll { it.file('src/main/groovy').exists() }
+    dependsOn = [tasks.named('cleanDocs')] + groovyDocProjects.collect { it.tasks.named('groovydoc') }
+
+    docTitle = "Groovy Server Pages (GSP) - ${project.name} - ${project.version}"
+    group = JavaBasePlugin.DOCUMENTATION_GROUP
+    description = 'Copies Groovy API Documentation for all supporting projects'
+    destinationDir = project.layout.buildDirectory.dir('docs/api').get().asFile
+    source = files(groovyDocProjects.collect { Project project -> project.files("src/main/groovy") })
+    classpath = files(groovyDocProjects.collect { Project project -> project.configurations.compileClasspath })
+}
+
+tasks.register('docs') {
+    group = JavaBasePlugin.DOCUMENTATION_GROUP
+    dependsOn = ['aggregateGroovydoc', 'docs:publishGuide']
+    finalizedBy 'copyGuide'
+}
+
+tasks.register('copyGuide', Copy) {
+    group = JavaBasePlugin.DOCUMENTATION_GROUP
+    from "${rootProject.allprojects.find { it.name == 'docs'}.projectDir}/build/docs"
+    includes = ['**']
+    into rootProject.layout.buildDirectory.dir('docs')
+    includeEmptyDirs = false
+}
diff --git a/gradle/java-config.gradle b/gradle/java-config.gradle
@@ -0,0 +1,16 @@
+apply plugin: 'idea'
+apply plugin: 'java-library'
+
+compileJava.options.release = 17
+
+java {
+    withSourcesJar()
+    withJavadocJar()
+}
+
+dependencies {
+    implementation platform("org.grails:grails-bom:$grailsVersion")
+    api "org.apache.groovy:groovy:$groovyVersion"
+    compileOnly "jakarta.servlet:jakarta.servlet-api"
+    compileOnly "jakarta.persistence:jakarta.persistence-api"
+}