You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2016/11/04 15:58:51 UTC
svn commit: r1768059 - in
/sling/trunk/contrib/extensions/contextaware-config/impl/src:
main/java/org/apache/sling/caconfig/resource/impl/def/
test/java/org/apache/sling/caconfig/resource/impl/def/
Author: cziegeler
Date: Fri Nov 4 15:58:51 2016
New Revision: 1768059
URL: http://svn.apache.org/viewvc?rev=1768059&view=rev
Log:
SLING-6239 : Support relative references in DefaultConfigurationResourceResolvingStrategy. Fix impl
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategyTest.java
Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java?rev=1768059&r1=1768058&r2=1768059&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java (original)
+++ sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java Fri Nov 4 15:58:51 2016
@@ -166,12 +166,8 @@ public class DefaultConfigurationResourc
String val = null;
while ( val == null && (useFromRelativePathsWith != null || contextResources.hasNext()) ) {
if ( useFromRelativePathsWith != null ) {
- val = useFromRelativePathsWith;
- for(final ContextResource part : relativePaths) {
- val = val + '/' + part.getConfigRef();
- }
final ContextResource contextResource = relativePaths.remove(relativePaths.size() - 1);
- val = checkPath(contextResource, val, notAllowedPostfix);
+ val = checkPath(contextResource, useFromRelativePathsWith + "/" + contextResource.getConfigRef(), notAllowedPostfix);
if ( relativePaths.isEmpty() ) {
useFromRelativePathsWith = null;
Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategyTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategyTest.java?rev=1768059&r1=1768058&r2=1768059&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategyTest.java (original)
+++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategyTest.java Fri Nov 4 15:58:51 2016
@@ -58,7 +58,7 @@ public class DefaultConfigurationResourc
.resource("/content/site2", PROPERTY_CONFIG_REF, "/conf/site2")
.resource("/content/mainsite", PROPERTY_CONFIG_REF, "/conf/main")
.resource("/content/mainsite/sub", PROPERTY_CONFIG_REF, "sub")
- .resource("/content/mainsite/sub/some/where/deep", PROPERTY_CONFIG_REF, "deep");
+ .resource("/content/mainsite/sub/some/where/deep", PROPERTY_CONFIG_REF, "sub/deep");
site1Page1 = context.create().resource("/content/site1/page1");
site2Page1 = context.create().resource("/content/site2/page1");
subPage = context.create().resource("/content/mainsite/sub/page1");