This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
from bafd1ead6e Merge pull request #14672 from
apache/add-licence-header-css-js
add c45918f3bb Import external config plugin
add 4bfe5f6374 Add documentation for external configuration
add 21248a6e76 feedback - test-app - removing asset / gsp plugins & minor
styling
add c53fb349f4 feedback - remove duplicate file
add 0f0b9f1626 feedback - use System.getProperty() instead of
System.properties
add d2b2d8d96b feedback - move away from logging category
add d12be969f7 feedback - remove unused field
new 3349f75c65 Merge pull request #14678 from jdaugherty/external-config
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:
.../external/ExternalConfigRunListener.groovy | 181 ++++++++++++
.../config/external/WriterFilteringMap.groovy | 97 ++++++
.../src/main/resources/META-INF/spring.factories | 23 +-
.../config/external/WriteFilteringMapSpec.groovy | 73 +++++
grails-doc/build.gradle | 5 +-
.../guide/conf/config/externalConfiguration.adoc | 135 +++++++++
.../{ymlOptions.adoc => ymlPropertyOptions.adoc} | 4 +-
grails-doc/src/en/guide/index.adoc | 2 +-
grails-doc/src/en/guide/introduction/whatsNew.adoc | 5 +
grails-doc/src/en/guide/toc.yml | 7 +-
.../{geb => external-configuration}/build.gradle | 29 +-
.../grails-app/conf/application.yml | 101 ++++---
.../grails-app/conf/logback-spring.xml | 27 +-
.../grails-app/conf/spring/resources.groovy | 5 +-
.../controllers/test/app}/UrlMappings.groovy | 11 +-
.../grails-app/i18n/messages.properties | 34 +--
.../grails-app/init/test/app}/Application.groovy | 3 +-
.../grails-app/init/test/app}/BootStrap.groovy | 4 +-
.../services/test/app}/TestService.groovy | 10 +-
.../groovy/test/app/TestServiceGroovySpec.groovy | 66 +++++
.../test/app/TestServicePropertiesSpec.groovy} | 25 +-
.../groovy/test/app/TestServiceSpec.groovy} | 19 +-
.../groovy/test/app/TestServiceYamlSpec.groovy} | 25 +-
.../resources/testResourceConfig.groovy} | 8 +-
.../resources/testResourceConfig.properties | 3 +-
.../resources/testResourceConfig.yml | 7 +-
.../src/main/groovy/test/app/TestSingleton.groovy} | 14 +-
.../src/main/resources/resourceConfig.yml | 7 +-
.../ConfigWithCanonicalParameter.groovy | 11 +-
.../ConfigWithEnvironmentBlock.groovy} | 19 +-
.../ConfigWithSecondLevelCanonicalParameter.groovy | 12 +-
.../ConfigWithoutEnvironmentBlock.groovy} | 11 +-
.../externalconfig/ExternalConfigSpec.groovy | 326 +++++++++++++++++++++
.../plugin/externalconfig/MergedConfigSpec.groovy | 83 ++++++
.../src/test/resources/externalConfig.groovy | 4 +-
.../src/test/resources/externalConfig.properties | 4 +-
.../src/test/resources/externalConfig.yml | 6 +-
.../test/resources/externalConfigEnvironments.yml | 14 +-
.../test/resources/externalConfigMultipleDocs.yml | 9 +-
.../externalConfigWithReferencedValue.groovy | 5 +-
.../externalConfigWithReferencedValue.properties | 4 +-
.../externalConfigWithReferencedValue.yml | 7 +-
.../src/test/resources/mergeExternalConfig.groovy} | 8 +-
.../test/resources/mergeExternalConfig.properties | 4 +-
.../src/test/resources/mergeExternalConfig.yml | 7 +-
.../src/test/resources/mergeExternalConfig2.groovy | 13 +-
settings.gradle | 2 +
47 files changed, 1238 insertions(+), 241 deletions(-)
create mode 100644
grails-core/src/main/groovy/grails/config/external/ExternalConfigRunListener.groovy
create mode 100644
grails-core/src/main/groovy/grails/config/external/WriterFilteringMap.groovy
create mode 100644
grails-core/src/test/groovy/grails/config/external/WriteFilteringMapSpec.groovy
create mode 100644
grails-doc/src/en/guide/conf/config/externalConfiguration.adoc
rename grails-doc/src/en/guide/conf/config/{ymlOptions.adoc =>
ymlPropertyOptions.adoc} (89%)
copy grails-test-examples/{geb => external-configuration}/build.gradle (83%)
copy grails-test-examples/{geb =>
external-configuration}/grails-app/conf/application.yml (72%)
copy grails-test-examples/{geb =>
external-configuration}/grails-app/conf/logback-spring.xml (65%)
copy grails-test-examples/{app1 =>
external-configuration}/grails-app/conf/spring/resources.groovy (93%)
copy grails-test-examples/{micronaut/grails-app/controllers/micronaut =>
external-configuration/grails-app/controllers/test/app}/UrlMappings.groovy (85%)
copy {grails-data-graphql/examples/grails-tenant-app =>
grails-test-examples/external-configuration}/grails-app/i18n/messages.properties
(80%)
copy
grails-test-examples/{hibernate5/grails-data-service/grails-app/init/example =>
external-configuration/grails-app/init/test/app}/Application.groovy (98%)
copy grails-test-examples/{geb/grails-app/init/org/demo/spock =>
external-configuration/grails-app/init/test/app}/BootStrap.groovy (97%)
copy grails-test-examples/{demo33/grails-app/services/demo =>
external-configuration/grails-app/services/test/app}/TestService.groovy (86%)
create mode 100644
grails-test-examples/external-configuration/src/integration-test/groovy/test/app/TestServiceGroovySpec.groovy
copy
grails-test-examples/{hibernate5/grails-data-service/src/integration-test/groovy/example/StudentServiceSpec.groovy
=>
external-configuration/src/integration-test/groovy/test/app/TestServicePropertiesSpec.groovy}
(63%)
copy
grails-test-examples/{demo33/src/integration-test/groovy/demo/DependencyInjectionSpec.groovy
=>
external-configuration/src/integration-test/groovy/test/app/TestServiceSpec.groovy}
(66%)
copy
grails-test-examples/{hibernate5/grails-data-service/src/integration-test/groovy/example/StudentServiceSpec.groovy
=>
external-configuration/src/integration-test/groovy/test/app/TestServiceYamlSpec.groovy}
(64%)
copy grails-test-examples/{gorm/grails-app/domain/gorm/Service.groovy =>
external-configuration/src/integration-test/resources/testResourceConfig.groovy}
(91%)
copy grails-test-suite-uber/src/test/groovy/application.properties =>
grails-test-examples/external-configuration/src/integration-test/resources/testResourceConfig.properties
(93%)
copy
grails-data-graphql/examples/spring-boot-app/src/main/resources/application.yml
=>
grails-test-examples/external-configuration/src/integration-test/resources/testResourceConfig.yml
(92%)
copy grails-test-examples/{demo33/grails-app/services/demo/TestService.groovy
=> external-configuration/src/main/groovy/test/app/TestSingleton.groovy} (81%)
copy
grails-data-graphql/examples/spring-boot-app/src/main/resources/application.yml
=>
grails-test-examples/external-configuration/src/main/resources/resourceConfig.yml
(93%)
copy
grails-data-graphql/examples/grails-multi-datastore-app/grails-app/domain/myapp/Foo.groovy
=>
grails-test-examples/external-configuration/src/test/groovy/grails/plugin/externalconfig/ConfigWithCanonicalParameter.groovy
(89%)
copy grails-test-examples/{app2/grails-app/controllers/UrlMappings.groovy =>
external-configuration/src/test/groovy/grails/plugin/externalconfig/ConfigWithEnvironmentBlock.groovy}
(75%)
copy
grails-data-graphql/examples/grails-multi-datastore-app/grails-app/domain/myapp/Foo.groovy
=>
grails-test-examples/external-configuration/src/test/groovy/grails/plugin/externalconfig/ConfigWithSecondLevelCanonicalParameter.groovy
(88%)
copy grails-test-examples/{app1/grails-app/domain/functionaltests/Foo.groovy
=>
external-configuration/src/test/groovy/grails/plugin/externalconfig/ConfigWithoutEnvironmentBlock.groovy}
(89%)
create mode 100644
grails-test-examples/external-configuration/src/test/groovy/grails/plugin/externalconfig/ExternalConfigSpec.groovy
create mode 100644
grails-test-examples/external-configuration/src/test/groovy/grails/plugin/externalconfig/MergedConfigSpec.groovy
copy
grails-data-neo4j/examples/grails3-neo4j-hibernate/grails-app/conf/spring/resources.groovy
=>
grails-test-examples/external-configuration/src/test/resources/externalConfig.groovy
(94%)
copy grails-test-suite-uber/src/test/groovy/application.properties =>
grails-test-examples/external-configuration/src/test/resources/externalConfig.properties
(94%)
copy
grails-data-graphql/examples/spring-boot-app/src/main/resources/application.yml
=>
grails-test-examples/external-configuration/src/test/resources/externalConfig.yml
(93%)
copy grails-data-graphql/plugin/grails-app/conf/plugin.yml =>
grails-test-examples/external-configuration/src/test/resources/externalConfigEnvironments.yml
(85%)
copy
grails-data-graphql/examples/spring-boot-app/src/main/resources/application.yml
=>
grails-test-examples/external-configuration/src/test/resources/externalConfigMultipleDocs.yml
(91%)
copy
grails-data-graphql/examples/grails-tenant-app/grails-app/conf/spring/resources.groovy
=>
grails-test-examples/external-configuration/src/test/resources/externalConfigWithReferencedValue.groovy
(90%)
copy grails-test-suite-uber/src/test/groovy/application.properties =>
grails-test-examples/external-configuration/src/test/resources/externalConfigWithReferencedValue.properties
(90%)
copy
grails-data-graphql/examples/spring-boot-app/src/main/resources/application.yml
=>
grails-test-examples/external-configuration/src/test/resources/externalConfigWithReferencedValue.yml
(91%)
copy grails-test-examples/{gorm/grails-app/domain/gorm/Service.groovy =>
external-configuration/src/test/resources/mergeExternalConfig.groovy} (93%)
copy grails-test-suite-uber/src/test/groovy/application.properties =>
grails-test-examples/external-configuration/src/test/resources/mergeExternalConfig.properties
(94%)
copy
grails-data-graphql/examples/spring-boot-app/src/main/resources/application.yml
=>
grails-test-examples/external-configuration/src/test/resources/mergeExternalConfig.yml
(93%)
copy
grails-data-graphql/examples/grails-multi-datastore-app/grails-app/domain/myapp/Foo.groovy
=>
grails-test-examples/external-configuration/src/test/resources/mergeExternalConfig2.groovy
(88%)
