Author: sseifert
Date: Sat Oct 8 08:26:38 2016
New Revision: 1763869
URL: http://svn.apache.org/viewvc?rev=1763869&view=rev
Log:
SLING-6117 introduce sling:config-property-inherit property
rename sling:config-inherit to sling:config-collection-inherit to distinguish
from resource property inheritance/merging
refactor and enhance unit tests
Added:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/PathEliminateDuplicatesIteratorTest.java
(with props)
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/ResourceEliminateDuplicatesIteratorTest.java
(with props)
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/ResourcePathCollatingIteratorTest.java
(with props)
Removed:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/hamcrest/ResourceCollectionMatcher.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/hamcrest/ResourceCollectionMatchers.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/hamcrest/ResourceIteratorMatcher.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/hamcrest/ResourceIteratorMatchers.java
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationNameConstants.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/ConfigurationResourceNameConstants.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationBuilderAdapterFactoryTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverAdaptableTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverAnnotationClassTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverCustomPersistenceTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverValueMapTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolverImplTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolvingStrategyMultiplexerTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ContextPathStrategyMultiplexerTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategyHierarchyTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategyTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultContextPathStrategyTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/PathParentExpandIteratorTest.java
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationNameConstants.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationNameConstants.java?rev=1763869&r1=1763868&r2=1763869&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationNameConstants.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationNameConstants.java
Sat Oct 8 08:26:38 2016
@@ -25,8 +25,14 @@ public final class ConfigurationNameCons
}
/**
- * Resource name for configuration data.
+ * Resource name for configuration data (configuration with key/value
pairs).
*/
public static final String CONFIGS_PARENT_NAME = "sling:configs";
+ /**
+ * Boolean property that controls whether the properties (key/value pairs)
of configuration resources
+ * should be inherited from the configuration hierarchy and merged.
+ */
+ public static final String PROPERTY_CONFIG_PROPERTY_MERGING =
"sling:config-property-inherit";
+
}
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/ConfigurationResourceNameConstants.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/ConfigurationResourceNameConstants.java?rev=1763869&r1=1763868&r2=1763869&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/ConfigurationResourceNameConstants.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/ConfigurationResourceNameConstants.java
Sat Oct 8 08:26:38 2016
@@ -34,6 +34,6 @@ public final class ConfigurationResource
* Boolean property that controls whether config resource collections
should be merged on inheritance or not.
* Merging means merging the lists, not the list items (properties of the
resources) itself.
*/
- public static final String PROPERTY_CONFIG_INHERIT =
"sling:config-inherit";
+ public static final String PROPERTY_CONFIG_COLLECTION_INHERIT =
"sling:config-collection-inherit";
}
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java?rev=1763869&r1=1763868&r2=1763869&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java
Sat Oct 8 08:26:38 2016
@@ -18,7 +18,7 @@
*/
package org.apache.sling.contextaware.config.resource.impl.def;
-import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_INHERIT;
+import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_COLLECTION_INHERIT;
import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF;
import java.util.ArrayList;
@@ -246,7 +246,7 @@ public class DefaultConfigurationResourc
if (item != null) {
// check inheritance mode on current level
- listMergingEnabled =
item.getValueMap().get(PROPERTY_CONFIG_INHERIT, listMergingEnabled);
+ listMergingEnabled =
item.getValueMap().get(PROPERTY_CONFIG_COLLECTION_INHERIT, listMergingEnabled);
// in inheritance is enabled on this level and candidates
where collected on previous levels add them now
if (listMergingEnabled == Boolean.TRUE &&
!resultCandidates.isEmpty()) {
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationBuilderAdapterFactoryTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationBuilderAdapterFactoryTest.java?rev=1763869&r1=1763868&r2=1763869&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationBuilderAdapterFactoryTest.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationBuilderAdapterFactoryTest.java
Sat Oct 8 08:26:38 2016
@@ -18,6 +18,7 @@
*/
package org.apache.sling.contextaware.config.impl;
+import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF;
import static org.junit.Assert.assertEquals;
import org.apache.sling.api.resource.Resource;
@@ -47,7 +48,7 @@ public class ConfigurationBuilderAdapter
"boolParam", true);
// content resources
- context.build().resource("/content/site1", "sling:config-ref",
"/conf/content/site1");
+ context.build().resource("/content/site1", PROPERTY_CONFIG_REF,
"/conf/content/site1");
site1Page1 = context.create().resource("/content/site1/page1");
}
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverAdaptableTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverAdaptableTest.java?rev=1763869&r1=1763868&r2=1763869&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverAdaptableTest.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverAdaptableTest.java
Sat Oct 8 08:26:38 2016
@@ -18,6 +18,7 @@
*/
package org.apache.sling.contextaware.config.impl;
+import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -67,8 +68,8 @@ public class ConfigurationResolverAdapta
.resource("3", "stringParam", "configValue1.3");
// content resources
- context.build().resource("/content/site1", "sling:config-ref",
"/conf/content/site1");
- context.build().resource("/content/site2", "sling:config-ref",
"/conf/content/site2");
+ context.build().resource("/content/site1", PROPERTY_CONFIG_REF,
"/conf/content/site1");
+ context.build().resource("/content/site2", PROPERTY_CONFIG_REF,
"/conf/content/site2");
site1Page1 = context.create().resource("/content/site1/page1");
site2Page1 = context.create().resource("/content/site2/page1");
}
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverAnnotationClassTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverAnnotationClassTest.java?rev=1763869&r1=1763868&r2=1763869&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverAnnotationClassTest.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverAnnotationClassTest.java
Sat Oct 8 08:26:38 2016
@@ -18,6 +18,7 @@
*/
package org.apache.sling.contextaware.config.impl;
+import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -84,8 +85,8 @@ public class ConfigurationResolverAnnota
.resource("3", "stringParam", "configValue1.3");
// content resources
- context.build().resource("/content/site1", "sling:config-ref",
"/conf/content/site1")
- .resource("/content/site2", "sling:config-ref",
"/conf/content/site2");
+ context.build().resource("/content/site1", PROPERTY_CONFIG_REF,
"/conf/content/site1")
+ .resource("/content/site2", PROPERTY_CONFIG_REF,
"/conf/content/site2");
site1Page1 = context.create().resource("/content/site1/page1");
site2Page1 = context.create().resource("/content/site2/page1");
}
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverCustomPersistenceTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverCustomPersistenceTest.java?rev=1763869&r1=1763868&r2=1763869&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverCustomPersistenceTest.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverCustomPersistenceTest.java
Sat Oct 8 08:26:38 2016
@@ -18,6 +18,7 @@
*/
package org.apache.sling.contextaware.config.impl;
+import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -91,8 +92,8 @@ public class ConfigurationResolverCustom
.resource("3/jcr:content", "stringParam", "configValue1.3");
// content resources
- context.build().resource("/content/site1", "sling:config-ref",
"/conf/content/site1")
- .resource("/content/site2", "sling:config-ref",
"/conf/content/site2");
+ context.build().resource("/content/site1", PROPERTY_CONFIG_REF,
"/conf/content/site1")
+ .resource("/content/site2", PROPERTY_CONFIG_REF,
"/conf/content/site2");
site1Page1 = context.create().resource("/content/site1/page1");
site2Page1 = context.create().resource("/content/site2/page1");
}
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverValueMapTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverValueMapTest.java?rev=1763869&r1=1763868&r2=1763869&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverValueMapTest.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverValueMapTest.java
Sat Oct 8 08:26:38 2016
@@ -18,6 +18,7 @@
*/
package org.apache.sling.contextaware.config.impl;
+import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -64,8 +65,8 @@ public class ConfigurationResolverValueM
.resource("3", "stringParam", "configValue1.3");
// content resources
- context.build().resource("/content/site1", "sling:config-ref",
"/conf/content/site1")
- .resource("/content/site2", "sling:config-ref",
"/conf/content/site2");
+ context.build().resource("/content/site1", PROPERTY_CONFIG_REF,
"/conf/content/site1")
+ .resource("/content/site2", PROPERTY_CONFIG_REF,
"/conf/content/site2");
site1Page1 = context.create().resource("/content/site1/page1");
site2Page1 = context.create().resource("/content/site2/page1");
}
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolverImplTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolverImplTest.java?rev=1763869&r1=1763868&r2=1763869&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolverImplTest.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolverImplTest.java
Sat Oct 8 08:26:38 2016
@@ -18,14 +18,14 @@
*/
package org.apache.sling.contextaware.config.resource.impl;
-import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_INHERIT;
+import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_COLLECTION_INHERIT;
import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import org.apache.sling.api.resource.Resource;
-import
org.apache.sling.contextaware.config.hamcrest.ResourceCollectionMatchers;
import
org.apache.sling.contextaware.config.resource.ConfigurationResourceResolver;
+import org.apache.sling.hamcrest.ResourceCollectionMatchers;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Before;
import org.junit.Rule;
@@ -64,7 +64,7 @@ public class ConfigurationResourceResolv
.resource("/conf/site2/sling:test/feature/d")
.resource("/apps/conf/sling:test/feature/a")
.resource("/libs/conf/sling:test/test")
- .resource("/libs/conf/sling:test/feature",
PROPERTY_CONFIG_INHERIT, true)
+ .resource("/libs/conf/sling:test/feature",
PROPERTY_CONFIG_COLLECTION_INHERIT, true)
.resource("/libs/conf/sling:test/feature/b");
}
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolvingStrategyMultiplexerTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolvingStrategyMultiplexerTest.java?rev=1763869&r1=1763868&r2=1763869&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolvingStrategyMultiplexerTest.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolvingStrategyMultiplexerTest.java
Sat Oct 8 08:26:38 2016
@@ -18,7 +18,7 @@
*/
package org.apache.sling.contextaware.config.resource.impl;
-import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_INHERIT;
+import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_COLLECTION_INHERIT;
import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -28,10 +28,10 @@ import static org.junit.Assert.assertTru
import java.util.Collection;
import org.apache.sling.api.resource.Resource;
-import
org.apache.sling.contextaware.config.hamcrest.ResourceCollectionMatchers;
import
org.apache.sling.contextaware.config.resource.impl.def.DefaultConfigurationResourceResolvingStrategy;
import
org.apache.sling.contextaware.config.resource.impl.def.DefaultContextPathStrategy;
import
org.apache.sling.contextaware.config.resource.spi.ConfigurationResourceResolvingStrategy;
+import org.apache.sling.hamcrest.ResourceCollectionMatchers;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Before;
import org.junit.Rule;
@@ -71,7 +71,7 @@ public class ConfigurationResourceResolv
.resource("/conf/site2/sling:test/feature/d")
.resource("/apps/conf/sling:test/feature/a")
.resource("/libs/conf/sling:test/test")
- .resource("/libs/conf/sling:test/feature",
PROPERTY_CONFIG_INHERIT, true)
+ .resource("/libs/conf/sling:test/feature",
PROPERTY_CONFIG_COLLECTION_INHERIT, true)
.resource("/libs/conf/sling:test/feature/b");
}
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ContextPathStrategyMultiplexerTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ContextPathStrategyMultiplexerTest.java?rev=1763869&r1=1763868&r2=1763869&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ContextPathStrategyMultiplexerTest.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ContextPathStrategyMultiplexerTest.java
Sat Oct 8 08:26:38 2016
@@ -18,6 +18,7 @@
*/
package org.apache.sling.contextaware.config.resource.impl;
+import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
@@ -26,9 +27,9 @@ import java.util.Iterator;
import java.util.List;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.contextaware.config.hamcrest.ResourceIteratorMatchers;
import
org.apache.sling.contextaware.config.resource.impl.def.DefaultContextPathStrategy;
import org.apache.sling.contextaware.config.resource.spi.ContextPathStrategy;
+import org.apache.sling.hamcrest.ResourceIteratorMatchers;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Before;
import org.junit.Rule;
@@ -50,10 +51,10 @@ public class ContextPathStrategyMultiple
// content resources that form a deeper hierarchy
context.build()
- .resource("/content/tenant1", "sling:config-ref", "/conf/tenant1")
- .resource("/content/tenant1/region1", "sling:config-ref",
"/conf/tenant1/region1")
- .resource("/content/tenant1/region1/site1", "sling:config-ref",
"/conf/tenant1/region1/site1")
- .resource("/content/tenant1/region1/site2", "sling:config-ref",
"/conf/tenant1/region1/site2");
+ .resource("/content/tenant1", PROPERTY_CONFIG_REF, "/conf/tenant1")
+ .resource("/content/tenant1/region1", PROPERTY_CONFIG_REF,
"/conf/tenant1/region1")
+ .resource("/content/tenant1/region1/site1", PROPERTY_CONFIG_REF,
"/conf/tenant1/region1/site1")
+ .resource("/content/tenant1/region1/site2", PROPERTY_CONFIG_REF,
"/conf/tenant1/region1/site2");
site1Page1 =
context.create().resource("/content/tenant1/region1/site1/page1");
site2Page1 =
context.create().resource("/content/tenant1/region1/site2/page1");
}
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategyHierarchyTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategyHierarchyTest.java?rev=1763869&r1=1763868&r2=1763869&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategyHierarchyTest.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategyHierarchyTest.java
Sat Oct 8 08:26:38 2016
@@ -18,16 +18,16 @@
*/
package org.apache.sling.contextaware.config.resource.impl.def;
-import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_INHERIT;
+import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_COLLECTION_INHERIT;
import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import org.apache.sling.api.resource.Resource;
-import
org.apache.sling.contextaware.config.hamcrest.ResourceCollectionMatchers;
import
org.apache.sling.contextaware.config.resource.impl.ContextPathStrategyMultiplexer;
import
org.apache.sling.contextaware.config.resource.spi.ConfigurationResourceResolvingStrategy;
+import org.apache.sling.hamcrest.ResourceCollectionMatchers;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Before;
import org.junit.Rule;
@@ -110,7 +110,7 @@ public class DefaultConfigurationResourc
.resource("/conf/brand1/sling:test/cfgCol/brand1")
.resource("/conf/global/sling:test/cfgCol/confGlobal")
.resource("/apps/conf/sling:test/cfgCol/appsGlobal")
- .resource("/libs/conf/sling:test/cfgCol", PROPERTY_CONFIG_INHERIT,
true)
+ .resource("/libs/conf/sling:test/cfgCol",
PROPERTY_CONFIG_COLLECTION_INHERIT, true)
.resource("/libs/conf/sling:test/cfgCol/libsGlobal1")
.resource("/libs/conf/sling:test/cfgCol/libsGlobal2");
@@ -145,7 +145,7 @@ public class DefaultConfigurationResourc
.resource("/conf/b1/sling:test/cfgCol/b1")
.resource("/conf/b1/b2/sling:test/cfgCol/b1_b2")
.resource("/conf/global/sling:test/cfgCol/confGlobal")
- .resource("/libs/conf/sling:test/cfgCol", PROPERTY_CONFIG_INHERIT,
true)
+ .resource("/libs/conf/sling:test/cfgCol",
PROPERTY_CONFIG_COLLECTION_INHERIT, true)
.resource("/apps/conf/sling:test/cfgCol/appsGlobal")
.resource("/libs/conf/sling:test/cfgCol/libsGlobal");
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategyTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategyTest.java?rev=1763869&r1=1763868&r2=1763869&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategyTest.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategyTest.java
Sat Oct 8 08:26:38 2016
@@ -18,7 +18,7 @@
*/
package org.apache.sling.contextaware.config.resource.impl.def;
-import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_INHERIT;
+import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_COLLECTION_INHERIT;
import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -26,9 +26,9 @@ import static org.junit.Assert.assertTha
import static org.junit.Assert.assertTrue;
import org.apache.sling.api.resource.Resource;
-import
org.apache.sling.contextaware.config.hamcrest.ResourceCollectionMatchers;
import
org.apache.sling.contextaware.config.resource.impl.ContextPathStrategyMultiplexer;
import
org.apache.sling.contextaware.config.resource.spi.ConfigurationResourceResolvingStrategy;
+import org.apache.sling.hamcrest.ResourceCollectionMatchers;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Before;
import org.junit.Rule;
@@ -125,9 +125,9 @@ public class DefaultConfigurationResourc
// build config resources
context.build()
- .resource("/conf/site1/sling:test/feature",
PROPERTY_CONFIG_INHERIT, true)
+ .resource("/conf/site1/sling:test/feature",
PROPERTY_CONFIG_COLLECTION_INHERIT, true)
.resource("/conf/site1/sling:test/feature/c")
- .resource("/conf/site2/sling:test/feature",
PROPERTY_CONFIG_INHERIT, true)
+ .resource("/conf/site2/sling:test/feature",
PROPERTY_CONFIG_COLLECTION_INHERIT, true)
.resource("/conf/site2/sling:test/feature/c")
.resource("/conf/site2/sling:test/feature/d")
.resource("/apps/conf/sling:test/feature/a")
@@ -159,7 +159,7 @@ public class DefaultConfigurationResourc
.resource("/conf/site2/sling:test/feature/c")
.resource("/conf/site2/sling:test/feature/d")
.resource("/apps/conf/sling:test/feature/a")
- .resource("/libs/conf/sling:test/feature",
PROPERTY_CONFIG_INHERIT, true)
+ .resource("/libs/conf/sling:test/feature",
PROPERTY_CONFIG_COLLECTION_INHERIT, true)
.resource("/libs/conf/sling:test/feature/b");
assertThat(underTest.getResourceCollection(site1Page1, BUCKET,
"feature"), ResourceCollectionMatchers.paths(
@@ -184,12 +184,12 @@ public class DefaultConfigurationResourc
// build config resources
context.build()
- .resource("/conf/site1/sling:test/feature",
PROPERTY_CONFIG_INHERIT, false)
+ .resource("/conf/site1/sling:test/feature",
PROPERTY_CONFIG_COLLECTION_INHERIT, false)
.resource("/conf/site1/sling:test/feature/c")
.resource("/conf/site2/sling:test/feature/c")
.resource("/conf/site2/sling:test/feature/d")
.resource("/apps/conf/sling:test/feature/a")
- .resource("/libs/conf/sling:test/feature",
PROPERTY_CONFIG_INHERIT, true)
+ .resource("/libs/conf/sling:test/feature",
PROPERTY_CONFIG_COLLECTION_INHERIT, true)
.resource("/libs/conf/sling:test/feature/b");
assertThat(underTest.getResourceCollection(site1Page1, BUCKET,
"feature"), ResourceCollectionMatchers.paths(
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultContextPathStrategyTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultContextPathStrategyTest.java?rev=1763869&r1=1763868&r2=1763869&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultContextPathStrategyTest.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultContextPathStrategyTest.java
Sat Oct 8 08:26:38 2016
@@ -18,12 +18,13 @@
*/
package org.apache.sling.contextaware.config.resource.impl.def;
+import static
org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.contextaware.config.hamcrest.ResourceIteratorMatchers;
import org.apache.sling.contextaware.config.resource.spi.ContextPathStrategy;
+import org.apache.sling.hamcrest.ResourceIteratorMatchers;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Before;
import org.junit.Rule;
@@ -41,10 +42,10 @@ public class DefaultContextPathStrategyT
public void setUp() {
// content resources that form a deeper hierarchy
context.build()
- .resource("/content/tenant1", "sling:config-ref", "/conf/tenant1")
- .resource("/content/tenant1/region1", "sling:config-ref",
"/conf/tenant1/region1")
- .resource("/content/tenant1/region1/site1", "sling:config-ref",
"/conf/tenant1/region1/site1")
- .resource("/content/tenant1/region1/site2", "sling:config-ref",
"/conf/tenant1/region1/site2");
+ .resource("/content/tenant1", PROPERTY_CONFIG_REF, "/conf/tenant1")
+ .resource("/content/tenant1/region1", PROPERTY_CONFIG_REF,
"/conf/tenant1/region1")
+ .resource("/content/tenant1/region1/site1", PROPERTY_CONFIG_REF,
"/conf/tenant1/region1/site1")
+ .resource("/content/tenant1/region1/site2", PROPERTY_CONFIG_REF,
"/conf/tenant1/region1/site2");
site1Page1 =
context.create().resource("/content/tenant1/region1/site1/page1");
site2Page1 =
context.create().resource("/content/tenant1/region1/site2/page1");
}
Added:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/PathEliminateDuplicatesIteratorTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/PathEliminateDuplicatesIteratorTest.java?rev=1763869&view=auto
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/PathEliminateDuplicatesIteratorTest.java
(added)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/PathEliminateDuplicatesIteratorTest.java
Sat Oct 8 08:26:38 2016
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.contextaware.config.resource.impl.util;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import com.google.common.collect.ImmutableList;
+
+public class PathEliminateDuplicatesIteratorTest {
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void testIterator() {
+ List<String> paths = ImmutableList.of(
+ "/conf/a",
+ "/conf/a/b",
+ "/conf/a",
+ "/conf/a/b/c");
+
+ List<String> result = ImmutableList.copyOf(new
PathEliminateDuplicatesIterator(paths.iterator()));
+ assertEquals(ImmutableList.of(
+ "/conf/a",
+ "/conf/a/b",
+ "/conf/a/b/c"), result);
+ }
+
+}
Propchange:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/PathEliminateDuplicatesIteratorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/PathEliminateDuplicatesIteratorTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Oct 8 08:26:38 2016
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author
Propchange:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/PathEliminateDuplicatesIteratorTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/PathParentExpandIteratorTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/PathParentExpandIteratorTest.java?rev=1763869&r1=1763868&r2=1763869&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/PathParentExpandIteratorTest.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/PathParentExpandIteratorTest.java
Sat Oct 8 08:26:38 2016
@@ -29,13 +29,13 @@ import com.google.common.collect.Immutab
public class PathParentExpandIteratorTest {
@Test
- public void testExpansion() {
- List<String> paths = ImmutableList.of(
+ public void testIterator() {
+ List<String> list = ImmutableList.of(
"/conf/a/b/c",
"/conf/a/b",
"/conf/x/y/z");
- List<String> result = ImmutableList.copyOf(new
PathParentExpandIterator("/conf", paths.iterator()));
+ List<String> result = ImmutableList.copyOf(new
PathParentExpandIterator("/conf", list.iterator()));
assertEquals(ImmutableList.of(
"/conf/a/b/c",
"/conf/a/b",
Added:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/ResourceEliminateDuplicatesIteratorTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/ResourceEliminateDuplicatesIteratorTest.java?rev=1763869&view=auto
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/ResourceEliminateDuplicatesIteratorTest.java
(added)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/ResourceEliminateDuplicatesIteratorTest.java
Sat Oct 8 08:26:38 2016
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.contextaware.config.resource.impl.util;
+
+import static org.junit.Assert.assertThat;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.hamcrest.ResourceIteratorMatchers;
+import org.apache.sling.testing.mock.sling.junit.SlingContext;
+import org.junit.Rule;
+import org.junit.Test;
+
+import com.google.common.collect.ImmutableList;
+
+public class ResourceEliminateDuplicatesIteratorTest {
+
+ @Rule
+ public SlingContext context = new SlingContext();
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void testIterator() {
+ context.build()
+ .resource("/conf/a")
+ .resource("/conf/a/b")
+ .resource("/conf/a/b/c");
+
+ List<Resource> list = ImmutableList.of(
+ context.resourceResolver().getResource("/conf/a"),
+ context.resourceResolver().getResource("/conf/a/b"),
+ context.resourceResolver().getResource("/conf/a"),
+ context.resourceResolver().getResource("/conf/a/b/c"));
+
+ Iterator<Resource> result = new
ResourceEliminateDuplicatesIterator(list.iterator());
+ assertThat(result, ResourceIteratorMatchers.paths(
+ "/conf/a",
+ "/conf/a/b",
+ "/conf/a/b/c"));
+ }
+
+}
Propchange:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/ResourceEliminateDuplicatesIteratorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/ResourceEliminateDuplicatesIteratorTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Oct 8 08:26:38 2016
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author
Propchange:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/ResourceEliminateDuplicatesIteratorTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/ResourcePathCollatingIteratorTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/ResourcePathCollatingIteratorTest.java?rev=1763869&view=auto
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/ResourcePathCollatingIteratorTest.java
(added)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/ResourcePathCollatingIteratorTest.java
Sat Oct 8 08:26:38 2016
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.contextaware.config.resource.impl.util;
+
+import static org.junit.Assert.assertThat;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.hamcrest.ResourceIteratorMatchers;
+import org.apache.sling.testing.mock.sling.junit.SlingContext;
+import org.junit.Rule;
+import org.junit.Test;
+
+import com.google.common.collect.ImmutableList;
+
+public class ResourcePathCollatingIteratorTest {
+
+ @Rule
+ public SlingContext context = new SlingContext();
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void testIterator() {
+ context.build()
+ .resource("/conf/a")
+ .resource("/conf/a/b")
+ .resource("/conf/a/b/c")
+ .resource("/conf/a/b/c/d");
+
+ List<Resource> list1 = ImmutableList.of(
+ context.resourceResolver().getResource("/conf/a/b/c/d"),
+ context.resourceResolver().getResource("/conf/a"));
+ List<Resource> list2 = ImmutableList.of(
+ context.resourceResolver().getResource("/conf/a/b/c"),
+ context.resourceResolver().getResource("/conf/a/b"),
+ context.resourceResolver().getResource("/conf/a"));
+
+ Iterator<Resource> result = new
ResourcePathCollatingIterator(ImmutableList.of(list1.iterator(),
list2.iterator()));
+ assertThat(result, ResourceIteratorMatchers.paths(
+ "/conf/a/b/c/d",
+ "/conf/a/b/c",
+ "/conf/a/b",
+ "/conf/a",
+ "/conf/a"));
+ }
+
+}
Propchange:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/ResourcePathCollatingIteratorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/ResourcePathCollatingIteratorTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sat Oct 8 08:26:38 2016
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author
Propchange:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/ResourcePathCollatingIteratorTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
