Author: kwin
Date: Thu Jun 22 12:34:00 2017
New Revision: 1799574
URL: http://svn.apache.org/viewvc?rev=1799574&view=rev
Log:
clarify naming of overlay vs. override pickers
Added:
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/ResourceTypeHierarchyBasedResourcePicker.java
- copied, changed from r1799573,
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/OverridingResourcePicker.java
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/SearchPathBasedResourcePicker.java
- copied, changed from r1799573,
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/MergingResourcePicker.java
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTestForResourceTypeBasedPicker.java
- copied, changed from r1799573,
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTestForOverridingPicker.java
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTestForSearchPathBasedPicker.java
- copied, changed from r1799573,
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTestForMergingPicker.java
Removed:
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/MergingResourcePicker.java
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/OverridingResourcePicker.java
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTestForMergingPicker.java
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTestForOverridingPicker.java
Copied:
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/ResourceTypeHierarchyBasedResourcePicker.java
(from r1799573,
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/OverridingResourcePicker.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/ResourceTypeHierarchyBasedResourcePicker.java?p2=sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/ResourceTypeHierarchyBasedResourcePicker.java&p1=sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/OverridingResourcePicker.java&r1=1799573&r2=1799574&rev=1799574&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/OverridingResourcePicker.java
(original)
+++
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/ResourceTypeHierarchyBasedResourcePicker.java
Thu Jun 22 12:34:00 2017
@@ -35,19 +35,19 @@ import org.apache.sling.resourcemerger.i
import org.apache.sling.resourcemerger.spi.MergedResourcePicker2;
@Component(name = "org.apache.sling.resourcemerger.picker.overriding",
- label = "Apache Sling Overriding Resource Picker",
- description = "This resource picker delivers merged resources based on the
resource type hierarchy.",
+ label = "Apache Sling Resource Merger - Resource Type Hierarchy Based
Resource Picker",
+ description = "This resource picker delivers merged resources based on the
resource type hierarchy (override approach).",
metatype = true, policy = ConfigurationPolicy.REQUIRE)
@Service
@Properties({
- @Property(name = MergedResourcePicker2.MERGE_ROOT, value =
OverridingResourcePicker.DEFAULT_ROOT,
+ @Property(name = MergedResourcePicker2.MERGE_ROOT, value =
ResourceTypeHierarchyBasedResourcePicker.DEFAULT_ROOT,
label = "Root", description = "Root path at which merged resources
will be available."),
@Property(name=MergedResourcePicker2.READ_ONLY, boolValue=true,
label="Read Only",
description="Specifies if the resources are read-only or can be
modified."),
@Property(name=MergedResourcePicker2.TRAVERSE_PARENT, boolValue=true,
propertyPrivate=true)
})
-public class OverridingResourcePicker implements MergedResourcePicker2 {
+public class ResourceTypeHierarchyBasedResourcePicker implements
MergedResourcePicker2 {
public static final String DEFAULT_ROOT = "/mnt/override";
Copied:
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/SearchPathBasedResourcePicker.java
(from r1799573,
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/MergingResourcePicker.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/SearchPathBasedResourcePicker.java?p2=sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/SearchPathBasedResourcePicker.java&p1=sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/MergingResourcePicker.java&r1=1799573&r2=1799574&rev=1799574&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/MergingResourcePicker.java
(original)
+++
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/SearchPathBasedResourcePicker.java
Thu Jun 22 12:34:00 2017
@@ -38,12 +38,12 @@ import org.apache.sling.resourcemerger.i
import org.apache.sling.resourcemerger.spi.MergedResourcePicker2;
@Component(name="org.apache.sling.resourcemerger.impl.MergedResourceProviderFactory",
- label = "Apache Sling Merged Resource Provider Factory",
- description = "This resource provider delivers merged resources
based on the search paths.",
+ label = "Apache Sling Resource Merger - Search Path Based Resource
Picker",
+ description = "This resource picker delivers merged resources based
on the search paths (overlay approach).",
metatype=true)
@Service(value={MergedResourcePicker2.class, ResourceMergerService.class})
@Properties({
- @Property(name=MergedResourcePicker2.MERGE_ROOT,
value=MergingResourcePicker.DEFAULT_ROOT,
+ @Property(name=MergedResourcePicker2.MERGE_ROOT,
value=SearchPathBasedResourcePicker.DEFAULT_ROOT,
label="Root",
description="The mount point of merged resources"),
@Property(name=MergedResourcePicker2.READ_ONLY, boolValue=true,
@@ -52,10 +52,9 @@ import org.apache.sling.resourcemerger.s
})
/**
- * The <code>MergedResourceProviderFactory</code> creates merged resource
- * providers and implements the <code>ResourceMergerService</code>.
+ * The <code>SearchPathBasedResourcePicker</code> delivers merged resources
based on the resource resolver's search path.
*/
-public class MergingResourcePicker implements MergedResourcePicker2,
ResourceMergerService {
+public class SearchPathBasedResourcePicker implements MergedResourcePicker2,
ResourceMergerService {
public static final String DEFAULT_ROOT = "/mnt/overlay";
Copied:
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTestForResourceTypeBasedPicker.java
(from r1799573,
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTestForOverridingPicker.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTestForResourceTypeBasedPicker.java?p2=sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTestForResourceTypeBasedPicker.java&p1=sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTestForOverridingPicker.java&r1=1799573&r2=1799574&rev=1799574&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTestForOverridingPicker.java
(original)
+++
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTestForResourceTypeBasedPicker.java
Thu Jun 22 12:34:00 2017
@@ -32,7 +32,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.resourcemerger.impl.picker.OverridingResourcePicker;
+import
org.apache.sling.resourcemerger.impl.picker.ResourceTypeHierarchyBasedResourcePicker;
import org.apache.sling.spi.resource.provider.ResourceContext;
import org.apache.sling.testing.resourceresolver.MockHelper;
import org.apache.sling.testing.resourceresolver.MockResourceResolverFactory;
@@ -40,7 +40,7 @@ import org.apache.sling.testing.resource
import org.junit.Before;
import org.junit.Test;
-public class MergedResourceProviderTestForOverridingPicker {
+public class MergedResourceProviderTestForResourceTypeBasedPicker {
private static final String SUPER_TYPE = "sling:resourceSuperType";
@@ -99,7 +99,7 @@ public class MergedResourceProviderTestF
.resource("z")
.commit();
- this.provider = new MergingResourceProvider("/override", new
OverridingResourcePicker(), false, true);
+ this.provider = new MergingResourceProvider("/override", new
ResourceTypeHierarchyBasedResourcePicker(), false, true);
this.ctx = new BasicResolveContext(resolver);
}
Copied:
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTestForSearchPathBasedPicker.java
(from r1799573,
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTestForMergingPicker.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTestForSearchPathBasedPicker.java?p2=sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTestForSearchPathBasedPicker.java&p1=sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTestForMergingPicker.java&r1=1799573&r2=1799574&rev=1799574&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTestForMergingPicker.java
(original)
+++
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTestForSearchPathBasedPicker.java
Thu Jun 22 12:34:00 2017
@@ -35,7 +35,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.resourcemerger.impl.picker.MergingResourcePicker;
+import
org.apache.sling.resourcemerger.impl.picker.SearchPathBasedResourcePicker;
import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceContext;
import org.apache.sling.testing.resourceresolver.MockHelper;
@@ -44,7 +44,7 @@ import org.apache.sling.testing.resource
import org.junit.Before;
import org.junit.Test;
-public class MergedResourceProviderTestForMergingPicker {
+public class MergedResourceProviderTestForSearchPathBasedPicker {
private ResourceResolver resolver;
@@ -86,7 +86,7 @@ public class MergedResourceProviderTestF
.resource("/libs/b").resource("c").resource("d").resource("e").resource("f")
.commit();
- this.provider = new CRUDMergingResourceProvider("/merged", new
MergingResourcePicker(), false);
+ this.provider = new CRUDMergingResourceProvider("/merged", new
SearchPathBasedResourcePicker(), false);
this.ctx = new BasicResolveContext(resolver);
}
