[sling-org-apache-sling-caconfig-api] 05/24: SLING-5886 : Merge in confmgr implementation

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.caconfig.api-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-api.git

commit fc3ecc6a7d805b3e8c88674ca8eab04a1a6aa8b6
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jul 29 13:22:22 2016 +0000

    SLING-5886 : Merge in confmgr implementation
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/context-aware-config/api@1754520 13f79535-47bb-0310-9956-ffa450edef68
---
 .../resource/ConfigurationResourceResolver.java           | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/apache/sling/contextaware/resource/ConfigurationResourceResolver.java b/src/main/java/org/apache/sling/contextaware/resource/ConfigurationResourceResolver.java
index e8f85d3..936313f 100644
--- a/src/main/java/org/apache/sling/contextaware/resource/ConfigurationResourceResolver.java
+++ b/src/main/java/org/apache/sling/contextaware/resource/ConfigurationResourceResolver.java
@@ -23,6 +23,7 @@ import java.util.Collection;
 import javax.annotation.Nonnull;
 
 import org.apache.sling.api.resource.Resource;
+import org.apache.sling.contextaware.config.ConfigurationResolver;
 import org.osgi.annotation.versioning.ProviderType;
 
 /**
@@ -34,21 +35,21 @@ import org.osgi.annotation.versioning.ProviderType;
 public interface ConfigurationResourceResolver {
 
     /**
-     * Get a context-specific singleton configuration resource defined by the given configuration name. 
+     * Get a context-specific singleton configuration resource defined by the given configuration name.
      * @param resource Context resource to fetch configuration for
      * @param configName Configuration name or relative path.
      * @return Configuration resource
      */
     @Nonnull Resource getResource(@Nonnull Resource resource, @Nonnull String configName);
-    
+
     /**
-     * Get a list of context-specific configuration resources defined by the given configuration name. 
+     * Get a collection of context-specific configuration resources defined by the given configuration name.
      * @param resource Context resource to fetch configuration for
      * @param configName Configuration name or relative path.
-     * @return List of configuration resources
+     * @return Collection of configuration resources
      */
-    @Nonnull Collection<Resource> getResourceList(@Nonnull Resource resource, @Nonnull String configName);
-    
+    @Nonnull Collection<Resource> getResourceCollection(@Nonnull Resource resource, @Nonnull String configName);
+
     /**
      * Get the inner-most context path (deepest path) returned by {@link #getAllContextPaths(Resource)}.
      * @param resource Context resource to fetch configuration for
@@ -64,5 +65,5 @@ public interface ConfigurationResourceResolver {
      * @return List of context paths
      */
     @Nonnull Collection<String> getAllContextPaths(@Nonnull Resource resource);
-    
+
 }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.