You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by jd...@apache.org on 2026/10/02 20:27:58 UTC
(grails-core) branch 7.1.x updated (380f2449cc -> c8912e33f4)
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a change to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
from 380f2449cc Merge branch '7.0.x' into 7.1.x
add b8950af8c9 Preserve servlet Errors through interceptor completion
add 6108b9f4ff Merge pull request #16467 from apache/fix/interceptor-error-throwables
add cffecea35f Link guide cross references to the chapter page that holds their target
add d8db2d173e Link cross references on sub-section and reference pages to their chapter
add 6a5bb12c0e Merge pull request #16476 from matrei/docs/guide-cross-chapter-links-7.0.x
new c8912e33f4 Merge branch '7.0.x' into 7.1.x
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:
build-logic/docs-core/build.gradle | 13 ++
.../src/main/groovy/grails/doc/DocPublisher.groovy | 94 +++++++++--
.../test/groovy/grails/doc/DocPublisherSpec.groovy | 175 +++++++++++++++++++++
.../guide/backgroundJobs/backgroundJobsBasic.adoc | 2 +-
grails-doc/src/en/guide/commandLine.adoc | 4 +-
.../conventionOverConfiguration.adoc | 4 +-
.../src/en/guide/security/authentication.adoc | 2 +-
.../springSecurity/acl/introduction.adoc | 2 +-
.../springSecurity/acl/tutorial.adoc | 2 +-
.../springSecurity/cas/introduction.adoc | 2 +-
.../securityPlugins/springSecurity/cas/usage.adoc | 2 +-
.../springSecurity/core/authentication/ajax.adoc | 2 +-
.../springSecurity/core/miscProperties.adoc | 4 +-
.../springSecurity/core/requestMappings.adoc | 2 +-
.../springSecurity/ldap/introduction.adoc | 2 +-
.../securityPlugins/springSecurity/ldap/usage.adoc | 2 +-
.../springSecurity/oauth2/introduction.adoc | 2 +-
.../springSecurity/rest/whatsNew20.adoc | 2 +-
.../securityPlugins/springSecurity/ui/acls.adoc | 2 +-
.../springSecurity/ui/introduction.adoc | 2 +-
.../fields/customizingFieldRendering.adoc | 2 +-
.../src/en/guide/theWebLayer/gson/gsonHal.adoc | 2 +-
.../interceptors/definingInterceptors.adoc | 5 +-
grails-doc/src/en/ref/Command Line/stop-app.adoc | 2 +-
grails-doc/src/en/ref/Plug-ins/codecs.adoc | 2 +-
grails-doc/src/en/ref/Tags - Fields/field.adoc | 2 +-
.../main/groovy/grails/artefact/Interceptor.groovy | 4 +-
...ailsInterceptorHandlerInterceptorAdapter.groovy | 12 +-
...InterceptorHandlerInterceptorAdapterSpec.groovy | 104 ++++++++++++
.../app1/grails-app/conf/spring/resources.groovy | 6 +
.../controllers/functionaltests/UrlMappings.groovy | 3 +
...terceptor.groovy => ErrorPageController.groovy} | 24 ++-
...erceptor.groovy => ErrorPageInterceptor.groovy} | 24 ++-
.../_simpleTemplate.gsp => errorPage/handle.gsp} | 5 +-
.../TomcatErrorPageInterceptorSpec.groovy | 76 +++++++++
.../interceptors/StaticInitFailure.groovy | 13 +-
.../interceptors/StaticInitFailureFilter.groovy | 22 +--
.../{jetty => undertow}/build.gradle | 19 ++-
.../grails-app/assets/javascripts/application.js | 0
.../grails-app/assets/stylesheets/application.css | 0
.../grails-app/conf/application.yml | 24 +--
.../grails-app/conf/logback-spring.xml | 1 -
.../grails-app/conf/spring/resources.groovy | 14 +-
.../undertowapp/ErrorPageController.groovy | 27 ++--
.../undertowapp/ErrorPageInterceptor.groovy} | 16 +-
.../controllers/undertowapp}/UrlMappings.groovy | 5 +-
.../init/undertowapp}/Application.groovy | 7 +-
.../grails-app/init/undertowapp}/BootStrap.groovy | 2 +-
.../{jetty => undertow}/grails-app/views/error.gsp | 1 +
.../grails-app/views/errorPage/handle.gsp} | 5 +-
.../grails-app/views/notFound.gsp | 1 +
.../UndertowErrorPageInterceptorSpec.groovy | 81 ++++++++++
.../groovy/undertowapp/StaticInitFailure.groovy | 13 +-
.../undertowapp/StaticInitFailureFilter.groovy | 22 +--
settings.gradle | 2 +
55 files changed, 703 insertions(+), 167 deletions(-)
create mode 100644 build-logic/docs-core/src/test/groovy/grails/doc/DocPublisherSpec.groovy
copy grails-test-examples/app1/grails-app/controllers/functionaltests/interceptors/{HttpMethodMatchingInterceptor.groovy => ErrorPageController.groovy} (62%)
copy grails-test-examples/app1/grails-app/controllers/functionaltests/interceptors/{HttpMethodMatchingInterceptor.groovy => ErrorPageInterceptor.groovy} (69%)
copy grails-test-examples/app1/grails-app/views/{tagLibTest/_simpleTemplate.gsp => errorPage/handle.gsp} (89%)
create mode 100644 grails-test-examples/app1/src/integration-test/groovy/functionaltests/interceptors/TomcatErrorPageInterceptorSpec.groovy
copy grails-databinding-core/src/main/groovy/org/grails/databinding/converters/StructuredDateBindingEditor.groovy => grails-test-examples/app1/src/main/groovy/functionaltests/interceptors/StaticInitFailure.groovy (72%)
copy grails-spring-security/rest/core/src/main/groovy/grails/plugin/springsecurity/rest/token/bearer/BearerTokenAccessDeniedHandler.groovy => grails-test-examples/app1/src/main/groovy/functionaltests/interceptors/StaticInitFailureFilter.groovy (58%)
copy grails-test-examples/{jetty => undertow}/build.gradle (79%)
copy grails-test-examples/{jetty => undertow}/grails-app/assets/javascripts/application.js (100%)
copy grails-test-examples/{jetty => undertow}/grails-app/assets/stylesheets/application.css (100%)
copy grails-test-examples/{hibernate5/grails-hibernate-groovy-proxy => undertow}/grails-app/conf/application.yml (81%)
copy grails-test-examples/{jetty => undertow}/grails-app/conf/logback-spring.xml (97%)
copy grails-test-examples/{hibernate5/grails-data-service => undertow}/grails-app/conf/spring/resources.groovy (76%)
copy grails-core/src/main/groovy/grails/core/events/ArtefactAdditionEvent.groovy => grails-test-examples/undertow/grails-app/controllers/undertowapp/ErrorPageController.groovy (60%)
copy grails-test-examples/{app1/grails-app/controllers/functionaltests/ErrorsControllerInterceptor.groovy => undertow/grails-app/controllers/undertowapp/ErrorPageInterceptor.groovy} (70%)
copy grails-test-examples/{plugins/exploded/grails-app/controllers/exploded => undertow/grails-app/controllers/undertowapp}/UrlMappings.groovy (90%)
mode change 100755 => 100644
copy grails-test-examples/{demo33/grails-app/init/demo => undertow/grails-app/init/undertowapp}/Application.groovy (98%)
copy grails-test-examples/{demo33/grails-app/init/demo => undertow/grails-app/init/undertowapp}/BootStrap.groovy (97%)
copy grails-test-examples/{jetty => undertow}/grails-app/views/error.gsp (99%)
copy grails-test-examples/{app1/grails-app/views/tagLibTest/_simpleTemplate.gsp => undertow/grails-app/views/errorPage/handle.gsp} (89%)
copy grails-test-examples/{jetty => undertow}/grails-app/views/notFound.gsp (99%)
create mode 100644 grails-test-examples/undertow/src/integration-test/groovy/undertowapp/UndertowErrorPageInterceptorSpec.groovy
copy grails-databinding-core/src/main/groovy/org/grails/databinding/converters/StructuredDateBindingEditor.groovy => grails-test-examples/undertow/src/main/groovy/undertowapp/StaticInitFailure.groovy (73%)
copy grails-spring-security/rest/core/src/main/groovy/grails/plugin/springsecurity/rest/token/bearer/BearerTokenAccessDeniedHandler.groovy => grails-test-examples/undertow/src/main/groovy/undertowapp/StaticInitFailureFilter.groovy (58%)
(grails-core) 01/01: Merge branch '7.0.x' into 7.1.x
Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit c8912e33f4f35f94b1c3225d9885df87a61430b5
Merge: 380f2449cc 6a5bb12c0e
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Fri Oct 2 16:27:47 2026 -0400
Merge branch '7.0.x' into 7.1.x
# Conflicts:
# settings.gradle
build-logic/docs-core/build.gradle | 13 ++
.../src/main/groovy/grails/doc/DocPublisher.groovy | 94 +++++++++--
.../test/groovy/grails/doc/DocPublisherSpec.groovy | 175 +++++++++++++++++++++
.../guide/backgroundJobs/backgroundJobsBasic.adoc | 2 +-
grails-doc/src/en/guide/commandLine.adoc | 4 +-
.../conventionOverConfiguration.adoc | 4 +-
.../src/en/guide/security/authentication.adoc | 2 +-
.../springSecurity/acl/introduction.adoc | 2 +-
.../springSecurity/acl/tutorial.adoc | 2 +-
.../springSecurity/cas/introduction.adoc | 2 +-
.../securityPlugins/springSecurity/cas/usage.adoc | 2 +-
.../springSecurity/core/authentication/ajax.adoc | 2 +-
.../springSecurity/core/miscProperties.adoc | 4 +-
.../springSecurity/core/requestMappings.adoc | 2 +-
.../springSecurity/ldap/introduction.adoc | 2 +-
.../securityPlugins/springSecurity/ldap/usage.adoc | 2 +-
.../springSecurity/oauth2/introduction.adoc | 2 +-
.../springSecurity/rest/whatsNew20.adoc | 2 +-
.../securityPlugins/springSecurity/ui/acls.adoc | 2 +-
.../springSecurity/ui/introduction.adoc | 2 +-
.../fields/customizingFieldRendering.adoc | 2 +-
.../src/en/guide/theWebLayer/gson/gsonHal.adoc | 2 +-
.../interceptors/definingInterceptors.adoc | 5 +-
grails-doc/src/en/ref/Command Line/stop-app.adoc | 2 +-
grails-doc/src/en/ref/Plug-ins/codecs.adoc | 2 +-
grails-doc/src/en/ref/Tags - Fields/field.adoc | 2 +-
.../main/groovy/grails/artefact/Interceptor.groovy | 4 +-
...ailsInterceptorHandlerInterceptorAdapter.groovy | 12 +-
...InterceptorHandlerInterceptorAdapterSpec.groovy | 104 ++++++++++++
.../app1/grails-app/conf/spring/resources.groovy | 6 +
.../controllers/functionaltests/UrlMappings.groovy | 3 +
.../interceptors/ErrorPageController.groovy} | 27 ++--
.../interceptors/ErrorPageInterceptor.groovy} | 27 ++--
.../app1/grails-app/views/errorPage/handle.gsp | 18 +++
.../TomcatErrorPageInterceptorSpec.groovy | 76 +++++++++
.../interceptors/StaticInitFailure.groovy} | 24 +--
.../interceptors/StaticInitFailureFilter.groovy | 41 +++++
grails-test-examples/undertow/build.gradle | 75 +++++++++
.../grails-app/assets/javascripts/application.js | 16 ++
.../grails-app/assets/stylesheets/application.css | 18 +++
.../undertow/grails-app/conf/application.yml | 36 +++++
.../undertow/grails-app/conf/logback-spring.xml | 41 +++++
.../grails-app/conf/spring/resources.groovy | 18 +--
.../undertowapp/ErrorPageController.groovy} | 27 ++--
.../undertowapp/ErrorPageInterceptor.groovy} | 27 ++--
.../controllers/undertowapp/UrlMappings.groovy} | 25 +--
.../init/undertowapp/Application.groovy} | 24 +--
.../grails-app/init/undertowapp/BootStrap.groovy} | 20 ++-
.../undertow/grails-app/views/error.gsp | 30 ++++
.../undertow/grails-app/views/errorPage/handle.gsp | 18 +++
.../undertow/grails-app/views/notFound.gsp | 29 ++++
.../UndertowErrorPageInterceptorSpec.groovy | 81 ++++++++++
.../groovy/undertowapp/StaticInitFailure.groovy} | 24 +--
.../undertowapp/StaticInitFailureFilter.groovy | 41 +++++
settings.gradle | 2 +
55 files changed, 1081 insertions(+), 150 deletions(-)
diff --cc settings.gradle
index d9787acb2f,061a36e74d..265bf23eb4
--- a/settings.gradle
+++ b/settings.gradle
@@@ -496,9 -492,10 +496,10 @@@ include
'grails-test-examples-quartz',
'grails-test-examples-scaffolding',
'grails-test-examples-scaffolding-fields',
+ 'grails-test-examples-test-phases',
+ 'grails-test-examples-undertow',
'grails-test-examples-views-functional-tests',
'grails-test-examples-views-functional-tests-plugin',
- 'grails-test-examples-jetty'
)
project(':grails-test-examples-async-events-pubsub-demo').projectDir = file('grails-test-examples/async-events-pubsub-demo')
project(':grails-test-examples-app1').projectDir = file('grails-test-examples/app1')
@@@ -542,8 -536,8 +543,9 @@@ project(':grails-test-examples-scaffold
project(':grails-test-examples-scaffolding-fields').projectDir = file('grails-test-examples/scaffolding-fields')
project(':grails-test-examples-views-functional-tests').projectDir = file('grails-test-examples/views-functional-tests')
project(':grails-test-examples-views-functional-tests-plugin').projectDir = file('grails-test-examples/views-functional-tests-plugin')
+project(':grails-test-examples-test-phases').projectDir = file('grails-test-examples/test-phases')
project(':grails-test-examples-jetty').projectDir = file('grails-test-examples/jetty')
+ project(':grails-test-examples-undertow').projectDir = file('grails-test-examples/undertow')
includeBuild('./grails-gradle') {
name = 'grails-gradle'