You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:18:55 UTC

[sling-org-apache-sling-caconfig-api] 09/24: SLING-5886 unify package names - always use "contextaware.config" in package name e.g. do not use org.apache.sling.contextaware.resource as package name for "ConfigurationResourceResolver" because it also has "configration" in it's name unify sling API dependency version

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 4826c7034339461e231e597b87af633a23cb99f2
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Fri Aug 19 09:57:41 2016 +0000

    SLING-5886 unify package names - always use "contextaware.config" in package name
    e.g. do not use org.apache.sling.contextaware.resource as package name for "ConfigurationResourceResolver" because it also has "configration" in it's name
    unify sling API dependency version
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/context-aware-config/api@1756894 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                                             | 2 +-
 .../{ => config}/resource/ConfigurationResourceResolver.java        | 6 +++---
 .../sling/contextaware/{ => config}/resource/package-info.java      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8556d61..9223622 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
-            <version>2.4.0</version>
+            <version>2.9.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/org/apache/sling/contextaware/resource/ConfigurationResourceResolver.java b/src/main/java/org/apache/sling/contextaware/config/resource/ConfigurationResourceResolver.java
similarity index 93%
rename from src/main/java/org/apache/sling/contextaware/resource/ConfigurationResourceResolver.java
rename to src/main/java/org/apache/sling/contextaware/config/resource/ConfigurationResourceResolver.java
index a06400c..c52aeda 100644
--- a/src/main/java/org/apache/sling/contextaware/resource/ConfigurationResourceResolver.java
+++ b/src/main/java/org/apache/sling/contextaware/config/resource/ConfigurationResourceResolver.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.contextaware.resource;
+package org.apache.sling.contextaware.config.resource;
 
 import java.util.Collection;
 
@@ -24,13 +24,13 @@ import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
 import org.apache.sling.api.resource.Resource;
-import org.apache.sling.contextaware.config.ConfigurationResolver;
 import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * Getting context-specific configuration resources for a given resource context.
  * This is a low-level interface for supporting advanced use cases. If you just want to fetch
- * some configuration parameters {@link ConfigurationResolver} is the right place.
+ * some configuration parameters {@link org.apache.sling.contextaware.config.ConfigurationResolver}
+ * is the right place.
  */
 @ProviderType
 public interface ConfigurationResourceResolver {
diff --git a/src/main/java/org/apache/sling/contextaware/resource/package-info.java b/src/main/java/org/apache/sling/contextaware/config/resource/package-info.java
similarity index 94%
rename from src/main/java/org/apache/sling/contextaware/resource/package-info.java
rename to src/main/java/org/apache/sling/contextaware/config/resource/package-info.java
index 4344ba3..c14e498 100644
--- a/src/main/java/org/apache/sling/contextaware/resource/package-info.java
+++ b/src/main/java/org/apache/sling/contextaware/config/resource/package-info.java
@@ -21,4 +21,4 @@
  * This is a low-level API.
  */
 @org.osgi.annotation.versioning.Version("1.0.0")
-package org.apache.sling.contextaware.resource;
+package org.apache.sling.contextaware.config.resource;

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