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 10e75370ae97fe9d096f35f926f9c8a48b7ae2ef Author: Justin Edelson <[email protected]> AuthorDate: Thu Sep 4 17:32:06 2014 +0000 SLING-3657 - requiring configuration to avoid excess registration git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1622515 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/sling/resourcemerger/impl/OverridingResourcePicker.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 597de92..eab462f 100644 --- a/src/main/java/org/apache/sling/resourcemerger/impl/OverridingResourcePicker.java +++ b/src/main/java/org/apache/sling/resourcemerger/impl/OverridingResourcePicker.java @@ -24,6 +24,7 @@ import java.util.Iterator; import java.util.List; import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.ConfigurationPolicy; import org.apache.felix.scr.annotations.Property; import org.apache.felix.scr.annotations.Service; import org.apache.sling.api.resource.NonExistingResource; @@ -33,7 +34,7 @@ import org.apache.sling.resourcemerger.spi.MergedResourcePicker; @Component(label = "Apache Sling Overriding Resource Picker", description = "This resource picker delivers merged resources based on the resource type hierarchy.", - metatype=true) + 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.") -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
