This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a change to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
from 10960ba19c Merge pull request #15966 from
codeconsole/refactor/scaffolding-static-descriptor
add 440c26cd00 Apply SiteMesh 3 decoration at the bean-definition level
add 321033c3f8 Compile the SiteMesh 3 plugin descriptor statically
add 31a229e323 Tighten the SiteMesh 3 plugin description and registration
site
add 84b5428237 Satisfy checkstyle operator-wrap rule
add db9d18f4f4 Rely on implicit SAM coercion for the bean registrar
add 6935b3e23a Merge branch '8.0.x' into
fix/sitemesh3-viewresolver-definition-wrap
add 65b8710a29 Suppress the upstream zero-wrap warning when the definition
wrap is in place
add ccbc50c6c7 Implement the definition wrap as upstream's bean-definition
mode
add d1cda68bbf Fix GspAutoConfiguration's use of the relocated property
defaults
add ba2c2ec223 Enforce mutual exclusion with grails-layout instead of
accommodating it
add 32bb99760f Tolerate a combined SiteMesh 2/3 classpath with a loud
warning
add eb50ef7f0c Simplify against SiteMesh 3.3.0-M2
add 9513a718a0 Groovy conversion & fix sitemesh 2 apps from transitively
including sitemesh3
new d3d445da01 Merge pull request #15964 from
codeconsole/fix/sitemesh3-viewresolver-definition-wrap
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dependencies.gradle | 4 +-
.../src/en/guide/upgrading/upgrading72x.adoc | 2 +-
...lsSiteMeshViewResolverBeanPostProcessor.groovy} | 60 +++++----
.../sitemesh3/Sitemesh3AutoConfiguration.groovy | 131 ++++++++++++++++++
.../Sitemesh3EnvironmentPostProcessor.groovy | 125 ++++++++++++++++++
.../plugins/sitemesh3/Sitemesh3GrailsPlugin.groovy | 75 +++++------
...mesh3ViewResolverDefinitionPostProcessor.groovy | 136 +++++++++++++++++++
.../sitemesh3/Sitemesh3AutoConfiguration.java | 105 ---------------
.../src/main/resources/META-INF/spring.factories | 5 +-
...iteMeshViewResolverBeanPostProcessorSpec.groovy | 18 ---
.../Sitemesh3AutoConfigurationSpec.groovy | 7 +-
.../Sitemesh3EnvironmentPostProcessorSpec.groovy | 100 ++++++++++++++
.../sitemesh3/Sitemesh3LayoutFinderSpec.groovy | 2 +-
...3ViewResolverDefinitionPostProcessorSpec.groovy | 147 +++++++++++++++++++++
.../java/grails/gsp/boot/GspAutoConfiguration.java | 8 +-
15 files changed, 728 insertions(+), 197 deletions(-)
rename
grails-gsp/grails-sitemesh3/src/main/{java/org/grails/plugins/sitemesh3/GrailsSiteMeshViewResolverBeanPostProcessor.java
=>
groovy/org/grails/plugins/sitemesh3/GrailsSiteMeshViewResolverBeanPostProcessor.groovy}
(55%)
create mode 100644
grails-gsp/grails-sitemesh3/src/main/groovy/org/grails/plugins/sitemesh3/Sitemesh3AutoConfiguration.groovy
create mode 100644
grails-gsp/grails-sitemesh3/src/main/groovy/org/grails/plugins/sitemesh3/Sitemesh3EnvironmentPostProcessor.groovy
create mode 100644
grails-gsp/grails-sitemesh3/src/main/groovy/org/grails/plugins/sitemesh3/Sitemesh3ViewResolverDefinitionPostProcessor.groovy
delete mode 100644
grails-gsp/grails-sitemesh3/src/main/java/org/grails/plugins/sitemesh3/Sitemesh3AutoConfiguration.java
copy
grails-data-hibernate5/core/src/test/resources/META-INF/services/org.apache.grails.data.testing.tck.base.GrailsDataTckManager
=> grails-gsp/grails-sitemesh3/src/main/resources/META-INF/spring.factories
(86%)
create mode 100644
grails-gsp/grails-sitemesh3/src/test/groovy/org/grails/plugins/sitemesh3/Sitemesh3EnvironmentPostProcessorSpec.groovy
create mode 100644
grails-gsp/grails-sitemesh3/src/test/groovy/org/grails/plugins/sitemesh3/Sitemesh3ViewResolverDefinitionPostProcessorSpec.groovy
