Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/ConfigurationResourceNameConstants.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/ConfigurationResourceNameConstants.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/ConfigurationResourceNameConstants.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/ConfigurationResourceNameConstants.java Fri Oct 14 21:38:06 2016 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.resource.impl.def; +package org.apache.sling.caconfig.resource.impl.def; public final class ConfigurationResourceNameConstants {
Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/ConfigurationResourceWrapper.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/ConfigurationResourceWrapper.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/ConfigurationResourceWrapper.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/ConfigurationResourceWrapper.java Fri Oct 14 21:38:06 2016 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.resource.impl.def; +package org.apache.sling.caconfig.resource.impl.def; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceWrapper; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java Fri Oct 14 21:38:06 2016 @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.resource.impl.def; +package org.apache.sling.caconfig.resource.impl.def; -import static org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_COLLECTION_INHERIT; -import static org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_PROPERTY_INHERIT; +import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_COLLECTION_INHERIT; +import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_PROPERTY_INHERIT; import java.util.ArrayList; import java.util.Collection; @@ -41,11 +41,11 @@ import org.apache.sling.api.resource.Res import org.apache.sling.api.resource.ResourceUtil; import org.apache.sling.api.resource.ValueMap; import org.apache.sling.api.wrappers.ValueMapDecorator; -import org.apache.sling.contextaware.config.resource.impl.ContextPathStrategyMultiplexer; -import org.apache.sling.contextaware.config.resource.impl.util.PathEliminateDuplicatesIterator; -import org.apache.sling.contextaware.config.resource.impl.util.PathParentExpandIterator; -import org.apache.sling.contextaware.config.resource.spi.ConfigurationResourceResolvingStrategy; -import org.apache.sling.contextaware.config.resource.spi.ContextResource; +import org.apache.sling.caconfig.resource.impl.ContextPathStrategyMultiplexer; +import org.apache.sling.caconfig.resource.impl.util.PathEliminateDuplicatesIterator; +import org.apache.sling.caconfig.resource.impl.util.PathParentExpandIterator; +import org.apache.sling.caconfig.resource.spi.ConfigurationResourceResolvingStrategy; +import org.apache.sling.caconfig.resource.spi.ContextResource; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultContextPathStrategy.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultContextPathStrategy.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultContextPathStrategy.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultContextPathStrategy.java Fri Oct 14 21:38:06 2016 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.resource.impl.def; +package org.apache.sling.caconfig.resource.impl.def; -import static org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; +import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; import java.util.Collections; import java.util.Iterator; @@ -26,8 +26,8 @@ import java.util.NoSuchElementException; import org.apache.commons.lang3.ArrayUtils; import org.apache.sling.api.resource.Resource; -import org.apache.sling.contextaware.config.resource.spi.ContextPathStrategy; -import org.apache.sling.contextaware.config.resource.spi.ContextResource; +import org.apache.sling.caconfig.resource.spi.ContextPathStrategy; +import org.apache.sling.caconfig.resource.spi.ContextResource; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.metatype.annotations.AttributeDefinition; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/WebConsolePlugin.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/WebConsolePlugin.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/WebConsolePlugin.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/WebConsolePlugin.java Fri Oct 14 21:38:06 2016 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.resource.impl.def; +package org.apache.sling.caconfig.resource.impl.def; // TODO: this web console plugin is currently quite broken and needs to be refactored and moved to another package // because of this it's disabled for now @@ -37,8 +37,8 @@ import org.apache.sling.api.resource.Log import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; -import org.apache.sling.contextaware.config.resource.impl.ConfigurationResourceResolverImpl; -import org.apache.sling.contextaware.config.resource.spi.ConfigurationResourceResolvingStrategy; +import org.apache.sling.caconfig.resource.impl.ConfigurationResourceResolverImpl; +import org.apache.sling.caconfig.resource.spi.ConfigurationResourceResolvingStrategy; import org.apache.sling.xss.XSSAPI; import org.osgi.service.component.annotations.Reference; import org.osgi.service.component.annotations.ReferencePolicyOption; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/PathEliminateDuplicatesIterator.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/PathEliminateDuplicatesIterator.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/PathEliminateDuplicatesIterator.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/PathEliminateDuplicatesIterator.java Fri Oct 14 21:38:06 2016 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.resource.impl.util; +package org.apache.sling.caconfig.resource.impl.util; import java.util.HashSet; import java.util.Iterator; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/PathParentExpandIterator.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/PathParentExpandIterator.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/PathParentExpandIterator.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/PathParentExpandIterator.java Fri Oct 14 21:38:06 2016 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.resource.impl.util; +package org.apache.sling.caconfig.resource.impl.util; import java.util.Iterator; import java.util.LinkedList; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/ResourceEliminateDuplicatesIterator.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/ResourceEliminateDuplicatesIterator.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/ResourceEliminateDuplicatesIterator.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/ResourceEliminateDuplicatesIterator.java Fri Oct 14 21:38:06 2016 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.resource.impl.util; +package org.apache.sling.caconfig.resource.impl.util; import java.util.HashSet; import java.util.Iterator; @@ -24,7 +24,7 @@ import java.util.Set; import org.apache.commons.collections.Predicate; import org.apache.commons.collections.iterators.FilterIterator; -import org.apache.sling.contextaware.config.resource.spi.ContextResource; +import org.apache.sling.caconfig.resource.spi.ContextResource; /** * Iterator that eliminates duplicate resources (having same path). Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/ResourcePathCollatingIterator.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/ResourcePathCollatingIterator.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/ResourcePathCollatingIterator.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/ResourcePathCollatingIterator.java Fri Oct 14 21:38:06 2016 @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.resource.impl.util; +package org.apache.sling.caconfig.resource.impl.util; import java.util.Comparator; import java.util.Iterator; import java.util.List; import org.apache.commons.collections.iterators.CollatingIterator; -import org.apache.sling.contextaware.config.resource.spi.ContextResource; +import org.apache.sling.caconfig.resource.spi.ContextResource; /** * Expected a list of iterators containing paths, where each path is a direct or indirect parent of the previous one Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/AllTypesConfig.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/AllTypesConfig.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/AllTypesConfig.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/AllTypesConfig.java Fri Oct 14 21:38:06 2016 @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.example; +package org.apache.sling.caconfig.example; -import static org.apache.sling.contextaware.config.example.AllTypesDefaults.BOOL_DEFAULT; -import static org.apache.sling.contextaware.config.example.AllTypesDefaults.BOOL_DEFAULT_2; -import static org.apache.sling.contextaware.config.example.AllTypesDefaults.DOUBLE_DEFAULT; -import static org.apache.sling.contextaware.config.example.AllTypesDefaults.DOUBLE_DEFAULT_2; -import static org.apache.sling.contextaware.config.example.AllTypesDefaults.INT_DEFAULT; -import static org.apache.sling.contextaware.config.example.AllTypesDefaults.INT_DEFAULT_2; -import static org.apache.sling.contextaware.config.example.AllTypesDefaults.LONG_DEFAULT; -import static org.apache.sling.contextaware.config.example.AllTypesDefaults.LONG_DEFAULT_2; -import static org.apache.sling.contextaware.config.example.AllTypesDefaults.STRING_DEFAULT; -import static org.apache.sling.contextaware.config.example.AllTypesDefaults.STRING_DEFAULT_2; +import static org.apache.sling.caconfig.example.AllTypesDefaults.BOOL_DEFAULT; +import static org.apache.sling.caconfig.example.AllTypesDefaults.BOOL_DEFAULT_2; +import static org.apache.sling.caconfig.example.AllTypesDefaults.DOUBLE_DEFAULT; +import static org.apache.sling.caconfig.example.AllTypesDefaults.DOUBLE_DEFAULT_2; +import static org.apache.sling.caconfig.example.AllTypesDefaults.INT_DEFAULT; +import static org.apache.sling.caconfig.example.AllTypesDefaults.INT_DEFAULT_2; +import static org.apache.sling.caconfig.example.AllTypesDefaults.LONG_DEFAULT; +import static org.apache.sling.caconfig.example.AllTypesDefaults.LONG_DEFAULT_2; +import static org.apache.sling.caconfig.example.AllTypesDefaults.STRING_DEFAULT; +import static org.apache.sling.caconfig.example.AllTypesDefaults.STRING_DEFAULT_2; -import org.apache.sling.contextaware.config.annotation.Configuration; +import org.apache.sling.caconfig.annotation.Configuration; @Configuration public @interface AllTypesConfig { Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/AllTypesDefaults.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/AllTypesDefaults.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/AllTypesDefaults.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/AllTypesDefaults.java Fri Oct 14 21:38:06 2016 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.example; +package org.apache.sling.caconfig.example; public final class AllTypesDefaults { Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/IllegalTypesConfig.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/IllegalTypesConfig.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/IllegalTypesConfig.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/IllegalTypesConfig.java Fri Oct 14 21:38:06 2016 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.example; +package org.apache.sling.caconfig.example; -import org.apache.sling.contextaware.config.annotation.Configuration; +import org.apache.sling.caconfig.annotation.Configuration; /** * All types in the example configuration class are *not* supported. Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/ListConfig.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/ListConfig.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/ListConfig.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/ListConfig.java Fri Oct 14 21:38:06 2016 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.example; +package org.apache.sling.caconfig.example; -import org.apache.sling.contextaware.config.annotation.Configuration; +import org.apache.sling.caconfig.annotation.Configuration; @Configuration public @interface ListConfig { Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/MetadataSimpleConfig.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/MetadataSimpleConfig.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/MetadataSimpleConfig.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/MetadataSimpleConfig.java Fri Oct 14 21:38:06 2016 @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.example; +package org.apache.sling.caconfig.example; -import org.apache.sling.contextaware.config.annotation.Configuration; -import org.apache.sling.contextaware.config.annotation.Property; +import org.apache.sling.caconfig.annotation.Configuration; +import org.apache.sling.caconfig.annotation.Property; @Configuration(name = "simpleConfig", label = "Simple configuration", Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/NestedConfig.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/NestedConfig.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/NestedConfig.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/NestedConfig.java Fri Oct 14 21:38:06 2016 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.example; +package org.apache.sling.caconfig.example; -import org.apache.sling.contextaware.config.annotation.Configuration; +import org.apache.sling.caconfig.annotation.Configuration; @Configuration public @interface NestedConfig { Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/SimpleConfig.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/SimpleConfig.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/SimpleConfig.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/SimpleConfig.java Fri Oct 14 21:38:06 2016 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.example; +package org.apache.sling.caconfig.example; -import org.apache.sling.contextaware.config.annotation.Configuration; +import org.apache.sling.caconfig.annotation.Configuration; @Configuration public @interface SimpleConfig { Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/SimpleSlingModel.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/SimpleSlingModel.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/SimpleSlingModel.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/SimpleSlingModel.java Fri Oct 14 21:38:06 2016 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.example; +package org.apache.sling.caconfig.example; import org.apache.sling.api.resource.Resource; import org.apache.sling.models.annotations.Model; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/SpecialNamesConfig.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/SpecialNamesConfig.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/SpecialNamesConfig.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/SpecialNamesConfig.java Fri Oct 14 21:38:06 2016 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.example; +package org.apache.sling.caconfig.example; -import org.apache.sling.contextaware.config.annotation.Configuration; +import org.apache.sling.caconfig.annotation.Configuration; @Configuration public @interface SpecialNamesConfig { Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/WithoutAnnotationConfig.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/WithoutAnnotationConfig.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/WithoutAnnotationConfig.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/WithoutAnnotationConfig.java Fri Oct 14 21:38:06 2016 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.example; +package org.apache.sling.caconfig.example; /** * Annotation classes without the proper Configuration annotation are not supported. Copied: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationBuilderAdapterFactoryTest.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationBuilderAdapterFactoryTest.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationBuilderAdapterFactoryTest.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationBuilderAdapterFactoryTest.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationBuilderAdapterFactoryTest.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationBuilderAdapterFactoryTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationBuilderAdapterFactoryTest.java Fri Oct 14 21:38:06 2016 @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.impl; +package org.apache.sling.caconfig.impl; -import static org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; +import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; import static org.junit.Assert.assertEquals; import org.apache.sling.api.resource.Resource; -import org.apache.sling.contextaware.config.ConfigurationBuilder; -import org.apache.sling.contextaware.config.example.SimpleConfig; +import org.apache.sling.caconfig.ConfigurationBuilder; +import org.apache.sling.caconfig.example.SimpleConfig; import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.junit.Before; import org.junit.Rule; @@ -42,7 +42,7 @@ public class ConfigurationBuilderAdapter context.registerInjectActivateService(new ConfigurationBuilderAdapterFactory()); // config resource - context.build().resource("/conf/content/site1/sling:configs/org.apache.sling.contextaware.config.example.SimpleConfig", + context.build().resource("/conf/content/site1/sling:configs/org.apache.sling.caconfig.example.SimpleConfig", "stringParam", "configValue1", "intParam", 111, "boolParam", true); Copied: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationProxyCachingInvocationHandlerTest.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationProxyCachingInvocationHandlerTest.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationProxyCachingInvocationHandlerTest.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationProxyCachingInvocationHandlerTest.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationProxyCachingInvocationHandlerTest.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationProxyCachingInvocationHandlerTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationProxyCachingInvocationHandlerTest.java Fri Oct 14 21:38:06 2016 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.impl; +package org.apache.sling.caconfig.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -27,7 +27,7 @@ import static org.mockito.Mockito.when; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; -import org.apache.sling.contextaware.config.impl.ConfigurationProxy.CachingInvocationHandler; +import org.apache.sling.caconfig.impl.ConfigurationProxy.CachingInvocationHandler; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; Copied: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationProxyTest.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationProxyTest.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationProxyTest.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationProxyTest.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationProxyTest.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationProxyTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationProxyTest.java Fri Oct 14 21:38:06 2016 @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.impl; +package org.apache.sling.caconfig.impl; -import static org.apache.sling.contextaware.config.example.AllTypesDefaults.BOOL_DEFAULT; -import static org.apache.sling.contextaware.config.example.AllTypesDefaults.BOOL_DEFAULT_2; -import static org.apache.sling.contextaware.config.example.AllTypesDefaults.DOUBLE_DEFAULT; -import static org.apache.sling.contextaware.config.example.AllTypesDefaults.DOUBLE_DEFAULT_2; -import static org.apache.sling.contextaware.config.example.AllTypesDefaults.INT_DEFAULT; -import static org.apache.sling.contextaware.config.example.AllTypesDefaults.INT_DEFAULT_2; -import static org.apache.sling.contextaware.config.example.AllTypesDefaults.LONG_DEFAULT; -import static org.apache.sling.contextaware.config.example.AllTypesDefaults.LONG_DEFAULT_2; -import static org.apache.sling.contextaware.config.example.AllTypesDefaults.STRING_DEFAULT; -import static org.apache.sling.contextaware.config.example.AllTypesDefaults.STRING_DEFAULT_2; +import static org.apache.sling.caconfig.example.AllTypesDefaults.BOOL_DEFAULT; +import static org.apache.sling.caconfig.example.AllTypesDefaults.BOOL_DEFAULT_2; +import static org.apache.sling.caconfig.example.AllTypesDefaults.DOUBLE_DEFAULT; +import static org.apache.sling.caconfig.example.AllTypesDefaults.DOUBLE_DEFAULT_2; +import static org.apache.sling.caconfig.example.AllTypesDefaults.INT_DEFAULT; +import static org.apache.sling.caconfig.example.AllTypesDefaults.INT_DEFAULT_2; +import static org.apache.sling.caconfig.example.AllTypesDefaults.LONG_DEFAULT; +import static org.apache.sling.caconfig.example.AllTypesDefaults.LONG_DEFAULT_2; +import static org.apache.sling.caconfig.example.AllTypesDefaults.STRING_DEFAULT; +import static org.apache.sling.caconfig.example.AllTypesDefaults.STRING_DEFAULT_2; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -39,14 +39,14 @@ import java.util.Collection; import java.util.List; import org.apache.sling.api.resource.Resource; -import org.apache.sling.contextaware.config.ConfigurationResolveException; -import org.apache.sling.contextaware.config.example.AllTypesConfig; -import org.apache.sling.contextaware.config.example.IllegalTypesConfig; -import org.apache.sling.contextaware.config.example.ListConfig; -import org.apache.sling.contextaware.config.example.NestedConfig; -import org.apache.sling.contextaware.config.example.SimpleConfig; -import org.apache.sling.contextaware.config.example.SpecialNamesConfig; -import org.apache.sling.contextaware.config.impl.ConfigurationProxy.ChildResolver; +import org.apache.sling.caconfig.ConfigurationResolveException; +import org.apache.sling.caconfig.example.AllTypesConfig; +import org.apache.sling.caconfig.example.IllegalTypesConfig; +import org.apache.sling.caconfig.example.ListConfig; +import org.apache.sling.caconfig.example.NestedConfig; +import org.apache.sling.caconfig.example.SimpleConfig; +import org.apache.sling.caconfig.example.SpecialNamesConfig; +import org.apache.sling.caconfig.impl.ConfigurationProxy.ChildResolver; import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.junit.Rule; import org.junit.Test; Copied: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverAdaptableTest.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverAdaptableTest.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverAdaptableTest.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverAdaptableTest.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverAdaptableTest.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverAdaptableTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverAdaptableTest.java Fri Oct 14 21:38:06 2016 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.impl; +package org.apache.sling.caconfig.impl; -import static org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; +import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -27,10 +27,10 @@ import java.util.Collection; import java.util.Iterator; import org.apache.sling.api.resource.Resource; -import org.apache.sling.contextaware.config.ConfigurationBuilder; -import org.apache.sling.contextaware.config.ConfigurationResolveException; -import org.apache.sling.contextaware.config.ConfigurationResolver; -import org.apache.sling.contextaware.config.example.SimpleSlingModel; +import org.apache.sling.caconfig.ConfigurationBuilder; +import org.apache.sling.caconfig.ConfigurationResolveException; +import org.apache.sling.caconfig.ConfigurationResolver; +import org.apache.sling.caconfig.example.SimpleSlingModel; import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.junit.Before; import org.junit.Rule; @@ -52,7 +52,7 @@ public class ConfigurationResolverAdapta public void setUp() { underTest = ConfigurationTestUtils.registerConfigurationResolver(context); - context.addModelsForPackage("org.apache.sling.contextaware.config.example"); + context.addModelsForPackage("org.apache.sling.caconfig.example"); // content resources context.build().resource("/content/site1", PROPERTY_CONFIG_REF, "/conf/content/site1"); Copied: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverAnnotationClassTest.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverAnnotationClassTest.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverAnnotationClassTest.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverAnnotationClassTest.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverAnnotationClassTest.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverAnnotationClassTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverAnnotationClassTest.java Fri Oct 14 21:38:06 2016 @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.impl; +package org.apache.sling.caconfig.impl; -import static org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_COLLECTION_INHERIT; -import static org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_PROPERTY_INHERIT; -import static org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; +import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_COLLECTION_INHERIT; +import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_PROPERTY_INHERIT; +import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -32,11 +32,11 @@ import java.util.Iterator; import java.util.List; import org.apache.sling.api.resource.Resource; -import org.apache.sling.contextaware.config.ConfigurationResolveException; -import org.apache.sling.contextaware.config.ConfigurationResolver; -import org.apache.sling.contextaware.config.example.ListConfig; -import org.apache.sling.contextaware.config.example.NestedConfig; -import org.apache.sling.contextaware.config.example.SimpleConfig; +import org.apache.sling.caconfig.ConfigurationResolveException; +import org.apache.sling.caconfig.ConfigurationResolver; +import org.apache.sling.caconfig.example.ListConfig; +import org.apache.sling.caconfig.example.NestedConfig; +import org.apache.sling.caconfig.example.SimpleConfig; import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.junit.Before; import org.junit.Rule; @@ -92,7 +92,7 @@ public class ConfigurationResolverAnnota @Test public void testConfig_Simple() { - context.build().resource("/conf/content/site1/sling:configs/org.apache.sling.contextaware.config.example.SimpleConfig", + context.build().resource("/conf/content/site1/sling:configs/org.apache.sling.caconfig.example.SimpleConfig", "stringParam", "configValue1", "intParam", 111, "boolParam", true); @@ -107,10 +107,10 @@ public class ConfigurationResolverAnnota @Test public void testConfig_Simple_PropertyInheritance() { context.build() - .resource("/conf/global/sling:configs/org.apache.sling.contextaware.config.example.SimpleConfig", + .resource("/conf/global/sling:configs/org.apache.sling.caconfig.example.SimpleConfig", "stringParam", "configValue1", "intParam", 111) - .resource("/conf/content/site1/sling:configs/org.apache.sling.contextaware.config.example.SimpleConfig", + .resource("/conf/content/site1/sling:configs/org.apache.sling.caconfig.example.SimpleConfig", "stringParam", "configValue2", "intParam", 222, "boolParam", true, @@ -139,7 +139,7 @@ public class ConfigurationResolverAnnota @Test public void testConfig_List() { - context.build().resource("/conf/content/site1/sling:configs/org.apache.sling.contextaware.config.example.ListConfig") + context.build().resource("/conf/content/site1/sling:configs/org.apache.sling.caconfig.example.ListConfig") .siblingsMode() .resource("1", "stringParam", "configValue1.1") .resource("2", "stringParam", "configValue1.2") @@ -157,11 +157,11 @@ public class ConfigurationResolverAnnota @Test public void testConfig_List_CollectionPropertyInheritance() { context.build() - .resource("/conf/global/sling:configs/org.apache.sling.contextaware.config.example.ListConfig") + .resource("/conf/global/sling:configs/org.apache.sling.caconfig.example.ListConfig") .siblingsMode() .resource("1", "stringParam", "configValue1.1", "intParam", "111") .resource("2", "stringParam", "configValue1.2", "intParam", "222") - .resource("/conf/content/site1/sling:configs/org.apache.sling.contextaware.config.example.ListConfig", + .resource("/conf/content/site1/sling:configs/org.apache.sling.caconfig.example.ListConfig", PROPERTY_CONFIG_PROPERTY_INHERIT, true, PROPERTY_CONFIG_COLLECTION_INHERIT, true) .siblingsMode() @@ -181,7 +181,7 @@ public class ConfigurationResolverAnnota @Test public void testConfig_Nested() { - context.build().resource("/conf/content/site1/sling:configs/org.apache.sling.contextaware.config.example.NestedConfig", + context.build().resource("/conf/content/site1/sling:configs/org.apache.sling.caconfig.example.NestedConfig", "stringParam", "configValue3") .siblingsMode() .resource("subConfig", "stringParam", "configValue4", "intParam", 444, "boolParam", true) @@ -211,9 +211,9 @@ public class ConfigurationResolverAnnota @Test public void testConfig_Nested_PropertyInheritance() { context.build() - .resource("/conf/global/sling:configs/org.apache.sling.contextaware.config.example.NestedConfig") + .resource("/conf/global/sling:configs/org.apache.sling.caconfig.example.NestedConfig") .resource("subConfig", "stringParam", "configValue1", "intParam", 111, "boolParam", true) - .resource("/conf/content/site1/sling:configs/org.apache.sling.contextaware.config.example.NestedConfig", + .resource("/conf/content/site1/sling:configs/org.apache.sling.caconfig.example.NestedConfig", "stringParam", "configValue3") .resource("subConfig", "stringParam", "configValue4", PROPERTY_CONFIG_PROPERTY_INHERIT, true); Copied: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverCustomPersistenceTest.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverCustomPersistenceTest.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverCustomPersistenceTest.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverCustomPersistenceTest.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverCustomPersistenceTest.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverCustomPersistenceTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverCustomPersistenceTest.java Fri Oct 14 21:38:06 2016 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.impl; +package org.apache.sling.caconfig.impl; -import static org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; +import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -29,13 +29,13 @@ import java.util.Collection; import java.util.Iterator; import org.apache.sling.api.resource.Resource; -import org.apache.sling.contextaware.config.ConfigurationResolveException; -import org.apache.sling.contextaware.config.ConfigurationResolver; -import org.apache.sling.contextaware.config.example.ListConfig; -import org.apache.sling.contextaware.config.example.NestedConfig; -import org.apache.sling.contextaware.config.example.SimpleConfig; -import org.apache.sling.contextaware.config.management.impl.CustomConfigurationPersistenceStrategy; -import org.apache.sling.contextaware.config.spi.ConfigurationPersistenceStrategy; +import org.apache.sling.caconfig.ConfigurationResolveException; +import org.apache.sling.caconfig.ConfigurationResolver; +import org.apache.sling.caconfig.example.ListConfig; +import org.apache.sling.caconfig.example.NestedConfig; +import org.apache.sling.caconfig.example.SimpleConfig; +import org.apache.sling.caconfig.management.impl.CustomConfigurationPersistenceStrategy; +import org.apache.sling.caconfig.spi.ConfigurationPersistenceStrategy; import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.junit.Before; import org.junit.Rule; @@ -94,7 +94,7 @@ public class ConfigurationResolverCustom @Test public void testConfig_Simple() { - context.build().resource("/conf/content/site1/sling:configs/org.apache.sling.contextaware.config.example.SimpleConfig/jcr:content", + context.build().resource("/conf/content/site1/sling:configs/org.apache.sling.caconfig.example.SimpleConfig/jcr:content", "stringParam", "configValue1", "intParam", 111, "boolParam", true); @@ -122,7 +122,7 @@ public class ConfigurationResolverCustom @Test public void testConfig_List() { - context.build().resource("/conf/content/site1/sling:configs/org.apache.sling.contextaware.config.example.ListConfig") + context.build().resource("/conf/content/site1/sling:configs/org.apache.sling.caconfig.example.ListConfig") .siblingsMode() .resource("1/jcr:content", "stringParam", "configValue1.1") .resource("2/jcr:content", "stringParam", "configValue1.2") @@ -139,7 +139,7 @@ public class ConfigurationResolverCustom @Test public void testConfig_Nested() { - context.build().resource("/conf/content/site1/sling:configs/org.apache.sling.contextaware.config.example.NestedConfig") + context.build().resource("/conf/content/site1/sling:configs/org.apache.sling.caconfig.example.NestedConfig") .siblingsMode() .resource("jcr:content", "stringParam", "configValue3") .resource("subConfig/jcr:content", "stringParam", "configValue4", "intParam", 444, "boolParam", true) Copied: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverValueMapTest.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverValueMapTest.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverValueMapTest.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverValueMapTest.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverValueMapTest.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverValueMapTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverValueMapTest.java Fri Oct 14 21:38:06 2016 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.impl; +package org.apache.sling.caconfig.impl; -import static org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; +import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -28,8 +28,8 @@ import java.util.Iterator; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ValueMap; -import org.apache.sling.contextaware.config.ConfigurationResolveException; -import org.apache.sling.contextaware.config.ConfigurationResolver; +import org.apache.sling.caconfig.ConfigurationResolveException; +import org.apache.sling.caconfig.ConfigurationResolver; import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.junit.Before; import org.junit.Rule; Copied: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationTestUtils.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationTestUtils.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationTestUtils.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationTestUtils.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationTestUtils.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationTestUtils.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationTestUtils.java Fri Oct 14 21:38:06 2016 @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.impl; +package org.apache.sling.caconfig.impl; -import org.apache.sling.contextaware.config.ConfigurationResolver; -import org.apache.sling.contextaware.config.impl.def.DefaultConfigurationPersistenceStrategy; -import org.apache.sling.contextaware.config.management.impl.ConfigurationPersistenceStrategyMultiplexer; -import org.apache.sling.contextaware.config.resource.impl.ConfigurationResourceTestUtils; +import org.apache.sling.caconfig.ConfigurationResolver; +import org.apache.sling.caconfig.impl.def.DefaultConfigurationPersistenceStrategy; +import org.apache.sling.caconfig.management.impl.ConfigurationPersistenceStrategyMultiplexer; +import org.apache.sling.caconfig.resource.impl.ConfigurationResourceTestUtils; import org.apache.sling.testing.mock.sling.junit.SlingContext; public final class ConfigurationTestUtils { Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/def/ConfigurationResolverPropertyInheritanceTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/def/ConfigurationResolverPropertyInheritanceTest.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/def/ConfigurationResolverPropertyInheritanceTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/def/ConfigurationResolverPropertyInheritanceTest.java Fri Oct 14 21:38:06 2016 @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.impl.def; +package org.apache.sling.caconfig.impl.def; -import static org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_PROPERTY_INHERIT; -import static org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; +import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_PROPERTY_INHERIT; +import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.hasEntry; import static org.hamcrest.Matchers.hasKey; @@ -27,8 +27,8 @@ import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertThat; import org.apache.sling.api.resource.Resource; -import org.apache.sling.contextaware.config.ConfigurationResolver; -import org.apache.sling.contextaware.config.impl.ConfigurationTestUtils; +import org.apache.sling.caconfig.ConfigurationResolver; +import org.apache.sling.caconfig.impl.ConfigurationTestUtils; import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.junit.Before; import org.junit.Rule; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategyTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategyTest.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategyTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategyTest.java Fri Oct 14 21:38:06 2016 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.impl.def; +package org.apache.sling.caconfig.impl.def; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -28,7 +28,7 @@ import java.util.Map; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ValueMap; -import org.apache.sling.contextaware.config.spi.ConfigurationPersistenceStrategy; +import org.apache.sling.caconfig.spi.ConfigurationPersistenceStrategy; import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.junit.Rule; import org.junit.Test; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassConfigurationMetadataProviderTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassConfigurationMetadataProviderTest.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassConfigurationMetadataProviderTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassConfigurationMetadataProviderTest.java Fri Oct 14 21:38:06 2016 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.impl.metadata; +package org.apache.sling.caconfig.impl.metadata; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -24,9 +24,9 @@ import static org.junit.Assert.assertTru import java.util.Set; -import org.apache.sling.contextaware.config.annotation.Configuration; -import org.apache.sling.contextaware.config.example.AllTypesConfig; -import org.apache.sling.contextaware.config.example.MetadataSimpleConfig; +import org.apache.sling.caconfig.annotation.Configuration; +import org.apache.sling.caconfig.example.AllTypesConfig; +import org.apache.sling.caconfig.example.MetadataSimpleConfig; import org.apache.sling.testing.mock.osgi.junit.OsgiContext; import org.junit.Before; import org.junit.Rule; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassParserTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassParserTest.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassParserTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassParserTest.java Fri Oct 14 21:38:06 2016 @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.impl.metadata; +package org.apache.sling.caconfig.impl.metadata; -import static org.apache.sling.contextaware.config.impl.metadata.AnnotationClassParser.buildConfigurationMetadata; -import static org.apache.sling.contextaware.config.impl.metadata.AnnotationClassParser.getConfigurationName; -import static org.apache.sling.contextaware.config.impl.metadata.AnnotationClassParser.getPropertyName; -import static org.apache.sling.contextaware.config.impl.metadata.AnnotationClassParser.isContextAwareConfig; +import static org.apache.sling.caconfig.impl.metadata.AnnotationClassParser.buildConfigurationMetadata; +import static org.apache.sling.caconfig.impl.metadata.AnnotationClassParser.getConfigurationName; +import static org.apache.sling.caconfig.impl.metadata.AnnotationClassParser.getPropertyName; +import static org.apache.sling.caconfig.impl.metadata.AnnotationClassParser.isContextAwareConfig; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; @@ -30,12 +30,12 @@ import static org.junit.Assert.assertTru import java.util.Collection; import org.apache.commons.lang3.StringUtils; -import org.apache.sling.contextaware.config.example.AllTypesConfig; -import org.apache.sling.contextaware.config.example.MetadataSimpleConfig; -import org.apache.sling.contextaware.config.example.SimpleConfig; -import org.apache.sling.contextaware.config.example.WithoutAnnotationConfig; -import org.apache.sling.contextaware.config.spi.metadata.ConfigurationMetadata; -import org.apache.sling.contextaware.config.spi.metadata.PropertyMetadata; +import org.apache.sling.caconfig.example.AllTypesConfig; +import org.apache.sling.caconfig.example.MetadataSimpleConfig; +import org.apache.sling.caconfig.example.SimpleConfig; +import org.apache.sling.caconfig.example.WithoutAnnotationConfig; +import org.apache.sling.caconfig.spi.metadata.ConfigurationMetadata; +import org.apache.sling.caconfig.spi.metadata.PropertyMetadata; import org.junit.Test; import com.google.common.collect.ImmutableMap; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/BundleEventUtil.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/BundleEventUtil.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/BundleEventUtil.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/BundleEventUtil.java Fri Oct 14 21:38:06 2016 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.impl.metadata; +package org.apache.sling.caconfig.impl.metadata; -import static org.apache.sling.contextaware.config.impl.ConfigurationNameConstants.CONFIGURATION_CLASSES_HEADER; +import static org.apache.sling.caconfig.impl.ConfigurationNameConstants.CONFIGURATION_CLASSES_HEADER; import java.io.File; import java.io.IOException; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/ConfigurationMetadataProviderMultiplexerTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/ConfigurationMetadataProviderMultiplexerTest.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/ConfigurationMetadataProviderMultiplexerTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/ConfigurationMetadataProviderMultiplexerTest.java Fri Oct 14 21:38:06 2016 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.impl.metadata; +package org.apache.sling.caconfig.impl.metadata; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -27,8 +27,8 @@ import java.util.Map; import java.util.SortedSet; import java.util.TreeSet; -import org.apache.sling.contextaware.config.spi.ConfigurationMetadataProvider; -import org.apache.sling.contextaware.config.spi.metadata.ConfigurationMetadata; +import org.apache.sling.caconfig.spi.ConfigurationMetadataProvider; +import org.apache.sling.caconfig.spi.metadata.ConfigurationMetadata; import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.junit.Before; import org.junit.Rule; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImplTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImplTest.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImplTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImplTest.java Fri Oct 14 21:38:06 2016 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.management.impl; +package org.apache.sling.caconfig.management.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -24,10 +24,10 @@ import static org.junit.Assert.assertTru import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ValueMap; -import org.apache.sling.contextaware.config.management.ConfigurationData; -import org.apache.sling.contextaware.config.management.ValueInfo; -import org.apache.sling.contextaware.config.spi.metadata.ConfigurationMetadata; -import org.apache.sling.contextaware.config.spi.metadata.PropertyMetadata; +import org.apache.sling.caconfig.management.ConfigurationData; +import org.apache.sling.caconfig.management.ValueInfo; +import org.apache.sling.caconfig.spi.metadata.ConfigurationMetadata; +import org.apache.sling.caconfig.spi.metadata.PropertyMetadata; import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.junit.Before; import org.junit.Rule; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplCustomPersistenceTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplCustomPersistenceTest.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplCustomPersistenceTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplCustomPersistenceTest.java Fri Oct 14 21:38:06 2016 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.management.impl; +package org.apache.sling.caconfig.management.impl; -import org.apache.sling.contextaware.config.spi.ConfigurationPersistenceStrategy; +import org.apache.sling.caconfig.spi.ConfigurationPersistenceStrategy; import org.junit.Before; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplTest.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplTest.java Fri Oct 14 21:38:06 2016 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.management.impl; +package org.apache.sling.caconfig.management.impl; -import static org.apache.sling.contextaware.config.impl.ConfigurationNameConstants.CONFIGS_PARENT_NAME; +import static org.apache.sling.caconfig.impl.ConfigurationNameConstants.CONFIGS_PARENT_NAME; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -31,16 +31,16 @@ import java.util.Map; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ValueMap; -import org.apache.sling.contextaware.config.impl.def.DefaultConfigurationPersistenceStrategy; -import org.apache.sling.contextaware.config.impl.metadata.ConfigurationMetadataProviderMultiplexer; -import org.apache.sling.contextaware.config.management.ConfigurationData; -import org.apache.sling.contextaware.config.management.ConfigurationManager; -import org.apache.sling.contextaware.config.resource.ConfigurationResourceResolver; -import org.apache.sling.contextaware.config.resource.impl.ConfigurationResourceResolvingStrategyMultiplexer; -import org.apache.sling.contextaware.config.resource.spi.ConfigurationResourceResolvingStrategy; -import org.apache.sling.contextaware.config.spi.ConfigurationMetadataProvider; -import org.apache.sling.contextaware.config.spi.metadata.ConfigurationMetadata; -import org.apache.sling.contextaware.config.spi.metadata.PropertyMetadata; +import org.apache.sling.caconfig.impl.def.DefaultConfigurationPersistenceStrategy; +import org.apache.sling.caconfig.impl.metadata.ConfigurationMetadataProviderMultiplexer; +import org.apache.sling.caconfig.management.ConfigurationData; +import org.apache.sling.caconfig.management.ConfigurationManager; +import org.apache.sling.caconfig.resource.ConfigurationResourceResolver; +import org.apache.sling.caconfig.resource.impl.ConfigurationResourceResolvingStrategyMultiplexer; +import org.apache.sling.caconfig.resource.spi.ConfigurationResourceResolvingStrategy; +import org.apache.sling.caconfig.spi.ConfigurationMetadataProvider; +import org.apache.sling.caconfig.spi.metadata.ConfigurationMetadata; +import org.apache.sling.caconfig.spi.metadata.PropertyMetadata; import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.junit.Before; import org.junit.Rule; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexerTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexerTest.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexerTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexerTest.java Fri Oct 14 21:38:06 2016 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.management.impl; +package org.apache.sling.caconfig.management.impl; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; @@ -28,8 +28,8 @@ import java.util.Map; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; -import org.apache.sling.contextaware.config.impl.def.DefaultConfigurationPersistenceStrategy; -import org.apache.sling.contextaware.config.spi.ConfigurationPersistenceStrategy; +import org.apache.sling.caconfig.impl.def.DefaultConfigurationPersistenceStrategy; +import org.apache.sling.caconfig.spi.ConfigurationPersistenceStrategy; import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.junit.Before; import org.junit.Rule; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/CustomConfigurationPersistenceStrategy.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/CustomConfigurationPersistenceStrategy.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/CustomConfigurationPersistenceStrategy.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/CustomConfigurationPersistenceStrategy.java Fri Oct 14 21:38:06 2016 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.management.impl; +package org.apache.sling.caconfig.management.impl; import java.util.Collection; import java.util.HashSet; @@ -30,11 +30,11 @@ import org.apache.sling.api.resource.Res import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceUtil; import org.apache.sling.api.resource.ValueMap; -import org.apache.sling.contextaware.config.spi.ConfigurationPersistenceException; -import org.apache.sling.contextaware.config.spi.ConfigurationPersistenceStrategy; +import org.apache.sling.caconfig.spi.ConfigurationPersistenceException; +import org.apache.sling.caconfig.spi.ConfigurationPersistenceStrategy; /** - * This is a variant of {@link org.apache.sling.contextaware.config.impl.def.DefaultConfigurationPersistenceStrategy} + * This is a variant of {@link org.apache.sling.caconfig.impl.def.DefaultConfigurationPersistenceStrategy} * which reads and stores data from a sub-resources named "jcr:content". */ public class CustomConfigurationPersistenceStrategy implements ConfigurationPersistenceStrategy { Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ValueInfoImplTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ValueInfoImplTest.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ValueInfoImplTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ValueInfoImplTest.java Fri Oct 14 21:38:06 2016 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.management.impl; +package org.apache.sling.caconfig.management.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -24,8 +24,8 @@ import static org.junit.Assert.assertNul import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import org.apache.sling.contextaware.config.management.ValueInfo; -import org.apache.sling.contextaware.config.spi.metadata.PropertyMetadata; +import org.apache.sling.caconfig.management.ValueInfo; +import org.apache.sling.caconfig.spi.metadata.PropertyMetadata; import org.junit.Before; import org.junit.Test; Copied: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolverImplTest.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolverImplTest.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolverImplTest.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolverImplTest.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolverImplTest.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolverImplTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolverImplTest.java Fri Oct 14 21:38:06 2016 @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.resource.impl; +package org.apache.sling.caconfig.resource.impl; -import static org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_COLLECTION_INHERIT; -import static org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; +import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_COLLECTION_INHERIT; +import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import org.apache.sling.api.resource.Resource; -import org.apache.sling.contextaware.config.resource.ConfigurationResourceResolver; +import org.apache.sling.caconfig.resource.ConfigurationResourceResolver; import org.apache.sling.hamcrest.ResourceCollectionMatchers; import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.junit.Before; Copied: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolvingStrategyMultiplexerTest.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolvingStrategyMultiplexerTest.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolvingStrategyMultiplexerTest.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolvingStrategyMultiplexerTest.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolvingStrategyMultiplexerTest.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolvingStrategyMultiplexerTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolvingStrategyMultiplexerTest.java Fri Oct 14 21:38:06 2016 @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.resource.impl; +package org.apache.sling.caconfig.resource.impl; -import static org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_COLLECTION_INHERIT; -import static org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; +import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_COLLECTION_INHERIT; +import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; @@ -28,9 +28,9 @@ import static org.junit.Assert.assertTru import java.util.Collection; import org.apache.sling.api.resource.Resource; -import org.apache.sling.contextaware.config.resource.impl.def.DefaultConfigurationResourceResolvingStrategy; -import org.apache.sling.contextaware.config.resource.impl.def.DefaultContextPathStrategy; -import org.apache.sling.contextaware.config.resource.spi.ConfigurationResourceResolvingStrategy; +import org.apache.sling.caconfig.resource.impl.def.DefaultConfigurationResourceResolvingStrategy; +import org.apache.sling.caconfig.resource.impl.def.DefaultContextPathStrategy; +import org.apache.sling.caconfig.resource.spi.ConfigurationResourceResolvingStrategy; import org.apache.sling.hamcrest.ResourceCollectionMatchers; import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.junit.Before; Copied: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceTestUtils.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceTestUtils.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceTestUtils.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceTestUtils.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceTestUtils.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceTestUtils.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceTestUtils.java Fri Oct 14 21:38:06 2016 @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.resource.impl; +package org.apache.sling.caconfig.resource.impl; -import org.apache.sling.contextaware.config.resource.ConfigurationResourceResolver; -import org.apache.sling.contextaware.config.resource.impl.def.DefaultConfigurationResourceResolvingStrategy; -import org.apache.sling.contextaware.config.resource.impl.def.DefaultContextPathStrategy; +import org.apache.sling.caconfig.resource.ConfigurationResourceResolver; +import org.apache.sling.caconfig.resource.impl.def.DefaultConfigurationResourceResolvingStrategy; +import org.apache.sling.caconfig.resource.impl.def.DefaultContextPathStrategy; import org.apache.sling.testing.mock.sling.junit.SlingContext; public final class ConfigurationResourceTestUtils {
