sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jus...@apache.org
Subject svn commit: r1622505 - /sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/OverridingResourcePicker.java
Date Thu, 04 Sep 2014 15:54:54 GMT
Author: justin
Date: Thu Sep  4 15:54:53 2014
New Revision: 1622505

URL: http://svn.apache.org/r1622505
Log:
SLING-3657 - adding metatype

Modified:
    sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/OverridingResourcePicker.java

Modified: sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/OverridingResourcePicker.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/OverridingResourcePicker.java?rev=1622505&r1=1622504&r2=1622505&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/OverridingResourcePicker.java
(original)
+++ sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/OverridingResourcePicker.java
Thu Sep  4 15:54:53 2014
@@ -31,10 +31,15 @@ import org.apache.sling.api.resource.Res
 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;



Mime
View raw message