Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BADE111CC1 for ; Thu, 4 Sep 2014 17:32:30 +0000 (UTC) Received: (qmail 45749 invoked by uid 500); 4 Sep 2014 17:32:30 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 45692 invoked by uid 500); 4 Sep 2014 17:32:30 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 45683 invoked by uid 99); 4 Sep 2014 17:32:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Sep 2014 17:32:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Sep 2014 17:32:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A109F23888A6; Thu, 4 Sep 2014 17:32:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@sling.apache.org From: justin@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140904173206.A109F23888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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.")