[sling-org-apache-sling-resourcemerger] 09/23: SLING-3657 - adding metatype

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.resourcemerger-1.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git

commit 7177d767b0a1270944338568ea947ca726a7f278
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Thu Sep 4 15:54:53 2014 +0000

    SLING-3657 - adding metatype
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1622505 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sling/resourcemerger/impl/OverridingResourcePicker.java      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/sling/resourcemerger/impl/OverridingResourcePicker.java b/src/main/java/org/apache/sling/resourcemerger/impl/OverridingResourcePicker.java
index 738ba38..597de92 100644
--- a/src/main/java/org/apache/sling/resourcemerger/impl/OverridingResourcePicker.java
+++ b/src/main/java/org/apache/sling/resourcemerger/impl/OverridingResourcePicker.java
@@ -31,10 +31,15 @@ import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.resourcemerger.spi.MergedResourcePicker;
 
-@Component
+@Component(label = "Apache Sling Overriding Resource Picker",
+    description = "This resource picker delivers merged resources based on the resource type hierarchy.",
+    metatype=true)
 @Service
-@Property(name = MergedResourcePicker.MERGE_ROOT, value = "/mnt/override")
+@Property(name = MergedResourcePicker.MERGE_ROOT, value = OverridingResourcePicker.DEFAULT_ROOT,
+    label = "Root", description = "Root path at which merged resources will be available.")
 public class OverridingResourcePicker implements MergedResourcePicker {
+    
+    public static final String DEFAULT_ROOT = "/mnt/override";
 
     public Iterator<Resource> pickResources(ResourceResolver resolver, String relativePath) {
         String absPath = "/" + relativePath;

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.