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 2016/07/29 12:31:34 UTC
svn commit: r1754505 - in
/sling/trunk/contrib/extensions/context-aware-config/api: ./
src/main/java/org/apache/sling/config/
src/main/java/org/apache/sling/contextaware/
src/main/java/org/apache/sling/contextaware/config/
src/main/java/org/apache/slin...
Author: cziegeler
Date: Fri Jul 29 12:31:34 2016
New Revision: 1754505
URL: http://svn.apache.org/viewvc?rev=1754505&view=rev
Log:
SLING-5886 : Refactor packages and update javadocs
Added:
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationBuilder.java
- copied, changed from r1754502, sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/ConfigurationBuilder.java
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationResolver.java
- copied, changed from r1754502, sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/ConfigurationResolver.java
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/package-info.java
- copied, changed from r1754502, sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/package-info.java
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationMetadataProvider.java
- copied, changed from r1754502, sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/ConfigurationMetadataProvider.java
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationOverrideProvider.java
- copied, changed from r1754502, sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/ConfigurationOverrideProvider.java
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationPersistenceProvider.java
- copied, changed from r1754502, sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/ConfigurationPersistenceProvider.java
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/ContextPathStrategy.java
- copied, changed from r1754502, sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/ContextPathStrategy.java
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/
- copied from r1754504, sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/metadata/
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/package-info.java
- copied, changed from r1754502, sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/package-info.java
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/resource/
- copied from r1754504, sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/resource/
sling/trunk/contrib/extensions/context-aware-config/api/src/test/java/org/apache/sling/contextaware/
sling/trunk/contrib/extensions/context-aware-config/api/src/test/java/org/apache/sling/contextaware/config/
sling/trunk/contrib/extensions/context-aware-config/api/src/test/java/org/apache/sling/contextaware/config/spi/
sling/trunk/contrib/extensions/context-aware-config/api/src/test/java/org/apache/sling/contextaware/config/spi/metadata/
- copied from r1754504, sling/trunk/contrib/extensions/context-aware-config/api/src/test/java/org/apache/sling/config/spi/metadata/
Removed:
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/
sling/trunk/contrib/extensions/context-aware-config/api/src/test/java/org/apache/sling/config/
Modified:
sling/trunk/contrib/extensions/context-aware-config/api/ (props changed)
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/AbstractConfigurationPart.java
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/ConfigurationMetadata.java
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/ConfigurationPart.java
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/PropertyMetadata.java
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/package-info.java
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/resource/ConfigurationResourceResolver.java
sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/resource/package-info.java
sling/trunk/contrib/extensions/context-aware-config/api/src/test/java/org/apache/sling/contextaware/config/spi/metadata/ConfigurationMetadataTest.java
sling/trunk/contrib/extensions/context-aware-config/api/src/test/java/org/apache/sling/contextaware/config/spi/metadata/PropertyMetadataTest.java
Propchange: sling/trunk/contrib/extensions/context-aware-config/api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 29 12:31:34 2016
@@ -0,0 +1,14 @@
+target
+sling
+bin
+logs
+jackrabbit-repository
+derby.log
+*.iml
+*.ipr
+*.iws
+.settings
+.project
+.classpath
+.externalToolBuilders
+maven-eclipse.xml
Copied: sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationBuilder.java (from r1754502, sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/ConfigurationBuilder.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationBuilder.java?p2=sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationBuilder.java&p1=sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/ConfigurationBuilder.java&r1=1754502&r2=1754505&rev=1754505&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/ConfigurationBuilder.java (original)
+++ sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationBuilder.java Fri Jul 29 12:31:34 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.config;
+package org.apache.sling.contextaware.config;
import java.util.Collection;
@@ -29,14 +29,19 @@ import org.osgi.annotation.versioning.Pr
*/
@ProviderType
public interface ConfigurationBuilder {
-
+
/**
- * Define configuration name. Optional when using annotation class, mandatory when getting configuration as value map.
+ * Define configuration name. This parameter is optional, it defaults to the class
+ * name of the argument provided either to {@link #as(Class)} or {@link #asCollection(Class)}.
+ *
+ * TODO - what happens if an invalid name is provided? I assume the same as if no
+ * configuration resource exists.
+ *
* @param configName Relative path
* @return Configuration builder
*/
@Nonnull ConfigurationBuilder name(@Nonnull String configName);
-
+
/**
* Get configuration as singleton and its properties mapped to the given annotation class.
* @param clazz Annotation class or {@link org.apache.sling.api.resource.ValueMap}
Copied: sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationResolver.java (from r1754502, sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/ConfigurationResolver.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationResolver.java?p2=sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationResolver.java&p1=sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/ConfigurationResolver.java&r1=1754502&r2=1754505&rev=1754505&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/ConfigurationResolver.java (original)
+++ sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationResolver.java Fri Jul 29 12:31:34 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.config;
+package org.apache.sling.contextaware.config;
import javax.annotation.Nonnull;
@@ -27,6 +27,11 @@ import org.osgi.annotation.versioning.Pr
* Getting context-specific configurations for a given resource context.
* Context-specific configuration may be different for different parts of the resource
* hierarchy, and configuration parameter inheritance may take place.
+ *
+ * This service builds on top of the {@link org.apache.sling.contextaware.resource.ConfigurationResourceResolver}
+ * and uses that service to resolve configuration resources. These resources
+ * can then be converted into application specific configuration objects
+ * using the {@link ConfigurationBuilder}.
*/
@ProviderType
public interface ConfigurationResolver {
Copied: sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/package-info.java (from r1754502, sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/package-info.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/package-info.java?p2=sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/package-info.java&p1=sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/package-info.java&r1=1754502&r2=1754505&rev=1754505&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/package-info.java (original)
+++ sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/package-info.java Fri Jul 29 12:31:34 2016
@@ -20,4 +20,4 @@
* API for accessing context-specific configuration.
*/
@org.osgi.annotation.versioning.Version("1.0.0")
-package org.apache.sling.config;
+package org.apache.sling.contextaware.config;
Copied: sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationMetadataProvider.java (from r1754502, sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/ConfigurationMetadataProvider.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationMetadataProvider.java?p2=sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationMetadataProvider.java&p1=sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/ConfigurationMetadataProvider.java&r1=1754502&r2=1754505&rev=1754505&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/ConfigurationMetadataProvider.java (original)
+++ sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationMetadataProvider.java Fri Jul 29 12:31:34 2016
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.config.spi;
+package org.apache.sling.contextaware.config.spi;
import java.util.Collection;
import javax.annotation.Nonnull;
-import org.apache.sling.config.spi.metadata.ConfigurationMetadata;
+import org.apache.sling.contextaware.config.spi.metadata.ConfigurationMetadata;
import org.osgi.annotation.versioning.ConsumerType;
/**
Copied: sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationOverrideProvider.java (from r1754502, sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/ConfigurationOverrideProvider.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationOverrideProvider.java?p2=sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationOverrideProvider.java&p1=sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/ConfigurationOverrideProvider.java&r1=1754502&r2=1754505&rev=1754505&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/ConfigurationOverrideProvider.java (original)
+++ sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationOverrideProvider.java Fri Jul 29 12:31:34 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.config.spi;
+package org.apache.sling.contextaware.config.spi;
import java.util.Map;
Copied: sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationPersistenceProvider.java (from r1754502, sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/ConfigurationPersistenceProvider.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationPersistenceProvider.java?p2=sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationPersistenceProvider.java&p1=sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/ConfigurationPersistenceProvider.java&r1=1754502&r2=1754505&rev=1754505&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/ConfigurationPersistenceProvider.java (original)
+++ sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationPersistenceProvider.java Fri Jul 29 12:31:34 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.config.spi;
+package org.apache.sling.contextaware.config.spi;
import java.util.Map;
Copied: sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/ContextPathStrategy.java (from r1754502, sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/ContextPathStrategy.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/ContextPathStrategy.java?p2=sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/ContextPathStrategy.java&p1=sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/ContextPathStrategy.java&r1=1754502&r2=1754505&rev=1754505&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/ContextPathStrategy.java (original)
+++ sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/ContextPathStrategy.java Fri Jul 29 12:31:34 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.config.spi;
+package org.apache.sling.contextaware.config.spi;
import java.util.Collection;
Modified: sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/AbstractConfigurationPart.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/AbstractConfigurationPart.java?rev=1754505&r1=1754504&r2=1754505&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/AbstractConfigurationPart.java (original)
+++ sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/AbstractConfigurationPart.java Fri Jul 29 12:31:34 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.config.spi.metadata;
+package org.apache.sling.contextaware.config.spi.metadata;
import java.util.HashMap;
Modified: sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/ConfigurationMetadata.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/ConfigurationMetadata.java?rev=1754505&r1=1754504&r2=1754505&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/ConfigurationMetadata.java (original)
+++ sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/ConfigurationMetadata.java Fri Jul 29 12:31:34 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.config.spi.metadata;
+package org.apache.sling.contextaware.config.spi.metadata;
import java.util.ArrayList;
import java.util.Collection;
Modified: sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/ConfigurationPart.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/ConfigurationPart.java?rev=1754505&r1=1754504&r2=1754505&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/ConfigurationPart.java (original)
+++ sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/ConfigurationPart.java Fri Jul 29 12:31:34 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.config.spi.metadata;
+package org.apache.sling.contextaware.config.spi.metadata;
import java.util.regex.Pattern;
Modified: sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/PropertyMetadata.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/PropertyMetadata.java?rev=1754505&r1=1754504&r2=1754505&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/PropertyMetadata.java (original)
+++ sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/PropertyMetadata.java Fri Jul 29 12:31:34 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.config.spi.metadata;
+package org.apache.sling.contextaware.config.spi.metadata;
import javax.annotation.Nonnull;
Modified: sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/package-info.java?rev=1754505&r1=1754504&r2=1754505&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/package-info.java (original)
+++ sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/metadata/package-info.java Fri Jul 29 12:31:34 2016
@@ -20,4 +20,4 @@
* Defining configuration and parameter metadata for the SPI.
*/
@org.osgi.annotation.versioning.Version("1.0.0")
-package org.apache.sling.config.spi.metadata;
+package org.apache.sling.contextaware.config.spi.metadata;
Copied: sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/package-info.java (from r1754502, sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/package-info.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/package-info.java?p2=sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/package-info.java&p1=sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/package-info.java&r1=1754502&r2=1754505&rev=1754505&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/config/spi/package-info.java (original)
+++ sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/config/spi/package-info.java Fri Jul 29 12:31:34 2016
@@ -20,4 +20,4 @@
* SPI for applications hooking into the configuration infrastructure for parameterizing and customizing.
*/
@org.osgi.annotation.versioning.Version("1.0.0")
-package org.apache.sling.config.spi;
+package org.apache.sling.contextaware.config.spi;
Modified: sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/resource/ConfigurationResourceResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/resource/ConfigurationResourceResolver.java?rev=1754505&r1=1754504&r2=1754505&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/resource/ConfigurationResourceResolver.java (original)
+++ sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/resource/ConfigurationResourceResolver.java Fri Jul 29 12:31:34 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.config.resource;
+package org.apache.sling.contextaware.resource;
import java.util.Collection;
Modified: sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/resource/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/resource/package-info.java?rev=1754505&r1=1754504&r2=1754505&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/resource/package-info.java (original)
+++ sling/trunk/contrib/extensions/context-aware-config/api/src/main/java/org/apache/sling/contextaware/resource/package-info.java Fri Jul 29 12:31:34 2016
@@ -21,4 +21,4 @@
* This is a low-level API.
*/
@org.osgi.annotation.versioning.Version("1.0.0")
-package org.apache.sling.config.resource;
+package org.apache.sling.contextaware.resource;
Modified: sling/trunk/contrib/extensions/context-aware-config/api/src/test/java/org/apache/sling/contextaware/config/spi/metadata/ConfigurationMetadataTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/context-aware-config/api/src/test/java/org/apache/sling/contextaware/config/spi/metadata/ConfigurationMetadataTest.java?rev=1754505&r1=1754504&r2=1754505&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/context-aware-config/api/src/test/java/org/apache/sling/contextaware/config/spi/metadata/ConfigurationMetadataTest.java (original)
+++ sling/trunk/contrib/extensions/context-aware-config/api/src/test/java/org/apache/sling/contextaware/config/spi/metadata/ConfigurationMetadataTest.java Fri Jul 29 12:31:34 2016
@@ -16,12 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.config.spi.metadata;
+package org.apache.sling.contextaware.config.spi.metadata;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import org.apache.sling.contextaware.config.spi.metadata.ConfigurationMetadata;
+import org.apache.sling.contextaware.config.spi.metadata.PropertyMetadata;
import org.junit.Test;
public class ConfigurationMetadataTest {
Modified: sling/trunk/contrib/extensions/context-aware-config/api/src/test/java/org/apache/sling/contextaware/config/spi/metadata/PropertyMetadataTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/context-aware-config/api/src/test/java/org/apache/sling/contextaware/config/spi/metadata/PropertyMetadataTest.java?rev=1754505&r1=1754504&r2=1754505&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/context-aware-config/api/src/test/java/org/apache/sling/contextaware/config/spi/metadata/PropertyMetadataTest.java (original)
+++ sling/trunk/contrib/extensions/context-aware-config/api/src/test/java/org/apache/sling/contextaware/config/spi/metadata/PropertyMetadataTest.java Fri Jul 29 12:31:34 2016
@@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.config.spi.metadata;
+package org.apache.sling.contextaware.config.spi.metadata;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
+import org.apache.sling.contextaware.config.spi.metadata.PropertyMetadata;
import org.junit.Test;
public class PropertyMetadataTest {