You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by sc...@apache.org on 2026/06/17 19:53:35 UTC
(grails-core) 01/01: Merge pull request #15713 from codeconsole/feat/sitemesh3-default-layout
This is an automated email from the ASF dual-hosted git repository.
codeconsole pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 831f3fc29ba800d17be021d7ef8107207ea8e90a
Merge: 35ad3b0713 d7667d5be2
Author: Scott Murphy <sc...@alwaysvip.com>
AuthorDate: Wed Jun 17 13:53:27 2026 -0600
Merge pull request #15713 from codeconsole/feat/sitemesh3-default-layout
8.x Make SiteMesh 3 the default GSP layout
.github/workflows/sitemesh2.yml | 127 +++++++++++++++++
gradle/publish-root-config.gradle | 1 +
grails-dependencies/starter-web/build.gradle | 2 +-
grails-doc/src/en/ref/Tags - GSP/applyLayout.adoc | 5 +-
.../grails/forge/feature/sitemesh3/Sitemesh3.java | 41 +++---
.../org/grails/forge/feature/view/GrailsGsp.java | 7 -
.../Sitemesh3.java => view/GrailsLayout.java} | 33 ++---
.../Sitemesh3.java => view/GspLayout.java} | 43 ++----
.../grails/forge/feature/view/GspLayoutSpec.groovy | 68 +++++++++
.../plugins/sitemesh3/Sitemesh3GrailsPlugin.groovy | 40 ++----
.../plugins/web/taglib/RenderSitemeshTagLib.groovy | 155 ++++++++++++++++++++-
.../sitemesh3/CaptureAwareContentProcessor.java | 8 ++
.../sitemesh3/GrailsSiteMeshViewContext.java | 14 +-
.../sitemesh3/GrailsSiteMeshViewResolver.java | 3 +
...railsSiteMeshViewResolverBeanPostProcessor.java | 30 ++++
.../sitemesh3/Sitemesh3AutoConfiguration.java | 2 +-
.../plugins/sitemesh3/Sitemesh3CapturedPage.java | 26 +++-
.../Sitemesh3EnvironmentPostProcessor.java | 70 ----------
.../plugins/sitemesh3/Sitemesh3LayoutFinder.java | 20 ++-
.../sitemesh3/Sitemesh3RenderViewMutator.java | 49 +++++++
.../src/main/resources/META-INF/spring.factories | 2 -
...ework.boot.env.EnvironmentPostProcessor.imports | 1 -
.../sitemesh3/GrailsSiteMeshViewContextSpec.groovy | 40 ++++++
...iteMeshViewResolverBeanPostProcessorSpec.groovy | 39 ++++++
.../GrailsSiteMeshViewResolverSpec.groovy | 22 +++
.../sitemesh3/Sitemesh3CapturedPageSpec.groovy | 77 ++++++++++
.../Sitemesh3EnvironmentPostProcessorSpec.groovy | 71 ----------
.../sitemesh3/Sitemesh3LayoutFinderSpec.groovy | 63 ++++++++-
.../Sitemesh3RenderViewMutatorSpec.groovy | 73 ++++++++++
grails-gsp/spring-boot/build.gradle | 10 +-
grails-profiles/web/profile.yml | 2 +-
grails-test-examples/app1/build.gradle | 7 +-
grails-test-examples/app2/build.gradle | 7 +-
grails-test-examples/app3/build.gradle | 7 +-
.../async-events-pubsub-demo/build.gradle | 7 +-
grails-test-examples/cache/build.gradle | 7 +-
grails-test-examples/config-report/build.gradle | 6 +-
grails-test-examples/database-cleanup/build.gradle | 1 -
grails-test-examples/datasources/build.gradle | 7 +-
grails-test-examples/demo33/build.gradle | 7 +-
grails-test-examples/exploded/build.gradle | 6 +-
.../external-configuration/build.gradle | 7 +-
grails-test-examples/geb-context-path/build.gradle | 7 +-
grails-test-examples/geb-gebconfig/build.gradle | 7 +-
grails-test-examples/geb/build.gradle | 7 +-
grails-test-examples/gorm/build.gradle | 7 +-
.../grails/layout/EndToEndController.groovy | 29 ++++
.../grails-app/views/endToEnd/_content.gsp | 19 +++
.../grails-app/views/endToEnd/_document.gsp | 22 +++
.../grails-app/views/endToEnd/actionContent.gsp | 19 +++
.../grails-app/views/endToEnd/modelContent.gsp | 19 +++
.../grails-app/views/endToEnd/parseContent.gsp | 22 +++
.../grails-app/views/endToEnd/templateContent.gsp | 19 +++
.../grails-app/views/endToEnd/templateDocument.gsp | 19 +++
.../grails-app/views/endToEnd/urlContent.gsp | 19 +++
.../grails-app/views/layouts/model.gsp | 22 +++
.../integration-test/groovy/EndToEndSpec.groovy | 61 ++++++++
.../grails-database-per-tenant/build.gradle | 7 +-
.../hibernate5/grails-hibernate/build.gradle | 7 +-
.../grails-partitioned-multi-tenancy/build.gradle | 7 +-
.../grails-schema-per-tenant/build.gradle | 7 +-
.../hibernate5/issue450/build.gradle | 7 +-
.../grails-database-per-tenant/build.gradle | 7 +-
.../hibernate7/grails-hibernate/build.gradle | 7 +-
.../grails-partitioned-multi-tenancy/build.gradle | 7 +-
.../grails-schema-per-tenant/build.gradle | 7 +-
.../hibernate7/issue450/build.gradle | 7 +-
grails-test-examples/hyphenated/build.gradle | 7 +-
grails-test-examples/issue-11102/build.gradle | 7 +-
.../issue-698-domain-save-npe/build.gradle | 7 +-
grails-test-examples/issue-views-182/build.gradle | 7 +-
grails-test-examples/jetty/build.gradle | 6 +-
grails-test-examples/mongodb/base/build.gradle | 7 +-
.../mongodb/database-per-tenant/build.gradle | 7 +-
.../mongodb/gson-templates/build.gradle | 7 +-
.../mongodb/hibernate5/build.gradle | 7 +-
grails-test-examples/namespaces/build.gradle | 7 +-
grails-test-examples/plugins/exploded/build.gradle | 6 +-
.../plugins/issue11005/build.gradle | 7 +-
.../plugins/loadafter/build.gradle | 7 +-
.../plugins/loadfirst/build.gradle | 7 +-
.../plugins/loadsecond/build.gradle | 7 +-
.../scaffolding-fields/build.gradle | 1 -
grails-test-examples/scaffolding/build.gradle | 6 +-
grails-test-examples/test-phases/build.gradle | 1 -
.../views-functional-tests/build.gradle | 7 +-
grails-test-suite-uber/build.gradle | 7 +-
settings.gradle | 4 +-
88 files changed, 1277 insertions(+), 433 deletions(-)