Make SiteMesh 3 the default GSP layout#74
Closed
codeconsole wants to merge 1 commit into
Closed
Conversation
jdaugherty
reviewed
Jun 2, 2026
jdaugherty
left a comment
Collaborator
There was a problem hiding this comment.
I think it's reasonable to consider this for an 8.0 default, but would like to hear from the wider team on this @matrei @jamesfredley @sbglasius
Collaborator
|
I realized this was created against @codeconsole repo instead of Apache's. Can we move this PR there? |
…s-layout Introduce a GspLayout one-of feature group so SiteMesh 3 (grails-sitemesh3) and the legacy SiteMesh 2 grails-layout are both selectable but never applied together (enforced by OneOfFeatureValidator): - GspLayout: abstract OneOfFeature parent (Category.VIEW), WEB/WEB_PLUGIN - Sitemesh3: default member; auto-applied unless another GspLayout is selected; adds grails-sitemesh3 - GrailsLayout: opt-in member; adds grails-layout (SiteMesh 2) Selecting both sitemesh3 and grails-layout now fails fast.
6c5ee99 to
a76e943
Compare
782c229 to
998e257
Compare
Owner
Author
|
Closing this fork-internal staging PR. The 'make SiteMesh 3 the default' change will be opened as a proper PR against apache/grails-core 8.0.x once apache#15710 (enable SiteMesh 3) merges, so its diff is just the make-default change. Branch |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Split out from apache#15710 per review feedback ("making this the default & updating to sitemesh 3 should be separate PRs").
This PR contains only the change that makes SiteMesh 3 the default GSP layout in generated applications (mutually exclusive with the
grails-layoutfeature). The work to update to and enable SiteMesh 3 on the 8.x (Spring Boot 4) line lives in apache#15710.Stacking
deps/sitemesh3-3.3.0-snapshot(the branch behind Enable SiteMesh 3 on the 8.x (Spring Boot 4) line apache/grails-core#15710), so the diff here is just the single make-default commit.8.0.xonce Enable SiteMesh 3 on the 8.x (Spring Boot 4) line apache/grails-core#15710 merges.Changes (grails-forge generator)
Sitemesh3.java— make SiteMesh 3 the default layout featureGrailsLayout.java/GspLayout.java— layout feature wiring, mutually exclusive with SiteMesh 3GrailsGsp.java— drop the now-implicit layout defaultGspLayoutSpec.groovy— coverage for the new layout selection behavior