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 ee50068d80af7ae1d5fc0566e2804ecc8ef6a95b Author: Carsten Ziegeler <[email protected]> AuthorDate: Tue Sep 16 13:52:15 2014 +0000 Use a better pid as this is actually public api git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1625286 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/resourcemerger/impl/picker/OverridingResourcePicker.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 a545d25..d7f8142 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 @@ -31,7 +31,8 @@ import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.resourcemerger.spi.MergedResourcePicker; -@Component(label = "Apache Sling Overriding Resource Picker", +@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.", metatype = true, policy = ConfigurationPolicy.REQUIRE) @Service -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
