GitHub user stefanseifert opened a pull request:
https://github.com/apache/sling/pull/177
SLING-6059 Context-Aware Config: Make resource inheritance for
configuration collections configurable
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/stefanseifert/sling
feature/SLING-6059-resource-inheritance
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/sling/pull/177.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #177
----
commit d9a6627a4b3d4a5a94214f36cbee34378f3f7647
Author: sseifert <[email protected]>
Date: 2016-10-06T14:19:52Z
SLING-6059 introduce ConfigurationResourceNameConstants
commit 1948686bc996980585cc841ef154e268c500c0c4
Author: sseifert <[email protected]>
Date: 2016-10-06T14:43:17Z
SLING-6059 simplify asset resource path syntax
commit f032a34e9945a4a0393cc76debae9501407ff3b0
Author: sseifert <[email protected]>
Date: 2016-10-06T15:41:17Z
simplify unit tests with hamcrest matchers
commit 024f9b4e07ed402b01c0579d83b5bb257fa751b3
Author: sseifert <[email protected]>
Date: 2016-10-06T15:54:23Z
Merge branch 'trunk' into feature/SLING-6059-resource-inheritance
# Conflicts:
#
contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultContextPathStrategy.java
commit bd7e34b2b4055332c3620a9ad94e850fed8ce3c1
Author: sseifert <[email protected]>
Date: 2016-10-06T16:11:47Z
SLING-6059 define test resources per test
commit c0ed65302c8ea8b33b25143da3e949ab5264224c
Author: sseifert <[email protected]>
Date: 2016-10-06T16:31:09Z
SLING-6059 define expectations as unit tests
commit 9f98b6d10add0a0fc7e3ef51c21711d4f9a6e57e
Author: sseifert <[email protected]>
Date: 2016-10-06T16:59:13Z
SLING-6059 implement resource inheritance via sling:config-inherit property
commit 9f0c8d5c1be8210c89ab1287cac9b4ddd0d6ce2a
Author: sseifert <[email protected]>
Date: 2016-10-06T17:14:41Z
Merge branch 'trunk' into feature/SLING-6059-resource-inheritance
# Conflicts:
#
contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/ConfigurationResourceNameConstants.java
#
contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java
#
contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolverImplTest.java
#
contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolvingStrategyMultiplexerTest.java
#
contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategyHierarchyTest.java
#
contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategyTest.java
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
