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 2ed6a66ae73d60fdc6e0bada576b61eed9a025d5 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Tue Sep 23 02:42:50 2014 +0000 SLING-3909 : Merged ResourceProviders should be optionally modifiable git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1626930 13f79535-47bb-0310-9956-ffa450edef68 --- .../resourcemerger/impl/picker/OverridingResourcePicker.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/sling/resourcemerger/impl/picker/OverridingResourcePicker.java b/src/main/java/org/apache/sling/resourcemerger/impl/picker/OverridingResourcePicker.java index d7f8142..1798a56 100644 --- a/src/main/java/org/apache/sling/resourcemerger/impl/picker/OverridingResourcePicker.java +++ b/src/main/java/org/apache/sling/resourcemerger/impl/picker/OverridingResourcePicker.java @@ -24,6 +24,7 @@ import java.util.List; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.ConfigurationPolicy; +import org.apache.felix.scr.annotations.Properties; import org.apache.felix.scr.annotations.Property; import org.apache.felix.scr.annotations.Service; import org.apache.sling.api.resource.NonExistingResource; @@ -36,8 +37,14 @@ import org.apache.sling.resourcemerger.spi.MergedResourcePicker; description = "This resource picker delivers merged resources based on the resource type hierarchy.", metatype = true, policy = ConfigurationPolicy.REQUIRE) @Service -@Property(name = MergedResourcePicker.MERGE_ROOT, value = OverridingResourcePicker.DEFAULT_ROOT, - label = "Root", description = "Root path at which merged resources will be available.") +@Properties({ + @Property(name = MergedResourcePicker.MERGE_ROOT, value = OverridingResourcePicker.DEFAULT_ROOT, + label = "Root", description = "Root path at which merged resources will be available."), + @Property(name=MergedResourcePicker.READ_ONLY, boolValue=true, + label="Read Only", + description="Specifies if the resources are read-only or can be modified.") + +}) public class OverridingResourcePicker implements MergedResourcePicker { public static final String DEFAULT_ROOT = "/mnt/override"; -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.