You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2014/09/16 15:52:15 UTC
svn commit: r1625286 -
/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/OverridingResourcePicker.java
Author: cziegeler
Date: Tue Sep 16 13:52:15 2014
New Revision: 1625286
URL: http://svn.apache.org/r1625286
Log:
Use a better pid as this is actually public api
Modified:
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/OverridingResourcePicker.java
Modified: sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/OverridingResourcePicker.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/OverridingResourcePicker.java?rev=1625286&r1=1625285&r2=1625286&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/OverridingResourcePicker.java (original)
+++ sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/picker/OverridingResourcePicker.java Tue Sep 16 13:52:15 2014
@@ -31,7 +31,8 @@ import org.apache.sling.api.resource.Res
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