sling-commits mailing list archives

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

URL: http://svn.apache.org/r1622515
Log:
SLING-3657 - requiring configuration to avoid excess registration

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=1622515&r1=1622514&r2=1622515&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 17:32:06 2014
@@ -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.s
 
 @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.")



Mime
View raw message