Copied: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/ContextPathStrategyMultiplexerTest.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ContextPathStrategyMultiplexerTest.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/ContextPathStrategyMultiplexerTest.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/ContextPathStrategyMultiplexerTest.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ContextPathStrategyMultiplexerTest.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/ContextPathStrategyMultiplexerTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/ContextPathStrategyMultiplexerTest.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 static org.apache.sling.contextaware.config.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; -import static org.apache.sling.contextaware.config.resource.impl.util.ContextResourceTestUtil.toContextResourceIterator; -import static org.apache.sling.contextaware.config.resource.impl.util.ContextResourceTestUtil.toResourceIterator; +import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; +import static org.apache.sling.caconfig.resource.impl.util.ContextResourceTestUtil.toContextResourceIterator; +import static org.apache.sling.caconfig.resource.impl.util.ContextResourceTestUtil.toResourceIterator; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; @@ -29,9 +29,9 @@ import java.util.Iterator; import java.util.List; import org.apache.sling.api.resource.Resource; -import org.apache.sling.contextaware.config.resource.impl.def.DefaultContextPathStrategy; -import org.apache.sling.contextaware.config.resource.spi.ContextPathStrategy; -import org.apache.sling.contextaware.config.resource.spi.ContextResource; +import org.apache.sling.caconfig.resource.impl.def.DefaultContextPathStrategy; +import org.apache.sling.caconfig.resource.spi.ContextPathStrategy; +import org.apache.sling.caconfig.resource.spi.ContextResource; import org.apache.sling.hamcrest.ResourceIteratorMatchers; import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.junit.Before;
Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategyHierarchyTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategyHierarchyTest.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategyHierarchyTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategyHierarchyTest.java Fri Oct 14 21:38:06 2016 @@ -16,17 +16,17 @@ * 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_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; import org.apache.sling.api.resource.Resource; -import org.apache.sling.contextaware.config.resource.impl.ContextPathStrategyMultiplexer; -import org.apache.sling.contextaware.config.resource.spi.ConfigurationResourceResolvingStrategy; +import org.apache.sling.caconfig.resource.impl.ContextPathStrategyMultiplexer; +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; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategyTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategyTest.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategyTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategyTest.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.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_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; import static org.junit.Assert.assertTrue; import org.apache.sling.api.resource.Resource; -import org.apache.sling.contextaware.config.resource.impl.ContextPathStrategyMultiplexer; -import org.apache.sling.contextaware.config.resource.spi.ConfigurationResourceResolvingStrategy; +import org.apache.sling.caconfig.resource.impl.ContextPathStrategyMultiplexer; +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; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/DefaultContextPathStrategyTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/DefaultContextPathStrategyTest.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/DefaultContextPathStrategyTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/DefaultContextPathStrategyTest.java Fri Oct 14 21:38:06 2016 @@ -16,15 +16,16 @@ * 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.contextaware.config.resource.impl.util.ContextResourceTestUtil.*; +import static org.apache.sling.caconfig.resource.impl.def.ConfigurationResourceNameConstants.PROPERTY_CONFIG_REF; +import static org.apache.sling.caconfig.resource.impl.util.ContextResourceTestUtil.toConfigRefIterator; +import static org.apache.sling.caconfig.resource.impl.util.ContextResourceTestUtil.toResourceIterator; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import org.apache.sling.api.resource.Resource; -import org.apache.sling.contextaware.config.resource.spi.ContextPathStrategy; +import org.apache.sling.caconfig.resource.spi.ContextPathStrategy; import org.apache.sling.hamcrest.ResourceIteratorMatchers; import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.hamcrest.Matchers; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/ContextResourceTestUtil.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/ContextResourceTestUtil.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/ContextResourceTestUtil.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/ContextResourceTestUtil.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.Iterator; import org.apache.commons.collections.IteratorUtils; import org.apache.commons.collections.Transformer; import org.apache.sling.api.resource.Resource; -import org.apache.sling.contextaware.config.resource.spi.ContextResource; +import org.apache.sling.caconfig.resource.spi.ContextResource; public final class ContextResourceTestUtil { Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/PathEliminateDuplicatesIteratorTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/PathEliminateDuplicatesIteratorTest.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/PathEliminateDuplicatesIteratorTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/PathEliminateDuplicatesIteratorTest.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 static org.junit.Assert.assertEquals; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/PathParentExpandIteratorTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/PathParentExpandIteratorTest.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/PathParentExpandIteratorTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/PathParentExpandIteratorTest.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 static org.junit.Assert.assertEquals; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/ResourceEliminateDuplicatesIteratorTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/ResourceEliminateDuplicatesIteratorTest.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/ResourceEliminateDuplicatesIteratorTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/ResourceEliminateDuplicatesIteratorTest.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.util; +package org.apache.sling.caconfig.resource.impl.util; -import static org.apache.sling.contextaware.config.resource.impl.util.ContextResourceTestUtil.toContextResourceIterator; -import static org.apache.sling.contextaware.config.resource.impl.util.ContextResourceTestUtil.toResourceIterator; +import static org.apache.sling.caconfig.resource.impl.util.ContextResourceTestUtil.toContextResourceIterator; +import static org.apache.sling.caconfig.resource.impl.util.ContextResourceTestUtil.toResourceIterator; import static org.junit.Assert.assertThat; import java.util.Iterator; Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/ResourcePathCollatingIteratorTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/ResourcePathCollatingIteratorTest.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/ResourcePathCollatingIteratorTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/ResourcePathCollatingIteratorTest.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.util; +package org.apache.sling.caconfig.resource.impl.util; -import static org.apache.sling.contextaware.config.resource.impl.util.ContextResourceTestUtil.toContextResourceIterator; -import static org.apache.sling.contextaware.config.resource.impl.util.ContextResourceTestUtil.toResourceIterator; +import static org.apache.sling.caconfig.resource.impl.util.ContextResourceTestUtil.toContextResourceIterator; +import static org.apache.sling.caconfig.resource.impl.util.ContextResourceTestUtil.toResourceIterator; import static org.junit.Assert.assertThat; import java.util.Iterator; Modified: sling/trunk/contrib/extensions/contextaware-config/integration-tests/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/pom.xml?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/integration-tests/pom.xml (original) +++ sling/trunk/contrib/extensions/contextaware-config/integration-tests/pom.xml Fri Oct 14 21:38:06 2016 @@ -27,9 +27,9 @@ <relativePath/> </parent> - <artifactId>org.apache.sling.contextaware.config.integration-tests</artifactId> + <artifactId>org.apache.sling.caconfig.integration-tests</artifactId> <packaging>slingstart</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1-SNAPSHOT</version> <name>Apache Sling Context-Aware Configuration Integration Tests</name> <description>Integration tests for the Apache Sling Context-Aware Configuration Implementation</description> @@ -145,19 +145,19 @@ <dependency> <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.contextaware.config.api</artifactId> + <artifactId>org.apache.sling.caconfig.api</artifactId> <version>1.0.0-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.contextaware.config.spi</artifactId> + <artifactId>org.apache.sling.caconfig.spi</artifactId> <version>1.0.0-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.contextaware.config.impl</artifactId> + <artifactId>org.apache.sling.caconfig.impl</artifactId> <version>1.0.0-SNAPSHOT</version> <scope>provided</scope> </dependency> Modified: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/integration-tests.txt URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/integration-tests.txt?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/integration-tests.txt (original) +++ sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/integration-tests.txt Fri Oct 14 21:38:06 2016 @@ -26,12 +26,12 @@ org.apache.sling/org.apache.sling.junit.core org.apache.sling/org.apache.sling.testing.tools org.apache.sling/org.apache.sling.resourcebuilder - org.apache.sling/org.apache.sling.contextaware.config.api - org.apache.sling/org.apache.sling.contextaware.config.spi - org.apache.sling/org.apache.sling.contextaware.config.impl + org.apache.sling/org.apache.sling.caconfig.api + org.apache.sling/org.apache.sling.caconfig.spi + org.apache.sling/org.apache.sling.caconfig.impl [configurations] org.apache.sling.commons.log.LogManager.factory.config-slingconfig.log - org.apache.sling.commons.log.names=["org.apache.sling.contextaware.config"] + org.apache.sling.commons.log.names=["org.apache.sling.caconfig"] org.apache.sling.commons.log.file="logs/sling-contextaware-config.log" org.apache.sling.commons.log.level="debug" Copied: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/AdaptToConfigClassIT.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/AdaptToConfigClassIT.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/AdaptToConfigClassIT.java?p2=sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/AdaptToConfigClassIT.java&p1=sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/AdaptToConfigClassIT.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/AdaptToConfigClassIT.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/AdaptToConfigClassIT.java Fri Oct 14 21:38:06 2016 @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.contextaware.config.it; +package org.apache.sling.caconfig.it; -import static org.apache.sling.contextaware.config.it.TestUtils.CONFIG_ROOT_PATH; -import static org.apache.sling.contextaware.config.it.TestUtils.CONTENT_ROOT_PATH; -import static org.apache.sling.contextaware.config.it.TestUtils.cleanUp; +import static org.apache.sling.caconfig.it.TestUtils.CONFIG_ROOT_PATH; +import static org.apache.sling.caconfig.it.TestUtils.CONTENT_ROOT_PATH; +import static org.apache.sling.caconfig.it.TestUtils.cleanUp; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -26,8 +26,8 @@ import static org.junit.Assert.assertNul 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.ConfigurationBuilder; -import org.apache.sling.contextaware.config.it.example.SimpleConfig; +import org.apache.sling.caconfig.ConfigurationBuilder; +import org.apache.sling.caconfig.it.example.SimpleConfig; import org.apache.sling.junit.rules.TeleporterRule; import org.apache.sling.resourcebuilder.api.ResourceBuilder; import org.apache.sling.resourcebuilder.api.ResourceBuilderFactory; @@ -74,7 +74,7 @@ public class AdaptToConfigClassIT { @Test public void testExistingConfig() throws Exception { - resourceBuilder.resource(CONFIG_PATH + "/sling:configs/org.apache.sling.contextaware.config.it.example.SimpleConfig", + resourceBuilder.resource(CONFIG_PATH + "/sling:configs/org.apache.sling.caconfig.it.example.SimpleConfig", "stringParam", "value1", "intParam", 123, "boolParam", true) Copied: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/ConfigurationManagerIT.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationManagerIT.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/ConfigurationManagerIT.java?p2=sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/ConfigurationManagerIT.java&p1=sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationManagerIT.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationManagerIT.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/ConfigurationManagerIT.java Fri Oct 14 21:38:06 2016 @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.contextaware.config.it; +package org.apache.sling.caconfig.it; -import static org.apache.sling.contextaware.config.it.TestUtils.CONFIG_ROOT_PATH; -import static org.apache.sling.contextaware.config.it.TestUtils.CONTENT_ROOT_PATH; -import static org.apache.sling.contextaware.config.it.TestUtils.cleanUp; +import static org.apache.sling.caconfig.it.TestUtils.CONFIG_ROOT_PATH; +import static org.apache.sling.caconfig.it.TestUtils.CONTENT_ROOT_PATH; +import static org.apache.sling.caconfig.it.TestUtils.cleanUp; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -34,10 +34,10 @@ import org.apache.sling.api.resource.Res import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.api.resource.ValueMap; -import org.apache.sling.contextaware.config.ConfigurationResolver; -import org.apache.sling.contextaware.config.it.example.SimpleConfig; -import org.apache.sling.contextaware.config.management.ConfigurationData; -import org.apache.sling.contextaware.config.management.ConfigurationManager; +import org.apache.sling.caconfig.ConfigurationResolver; +import org.apache.sling.caconfig.it.example.SimpleConfig; +import org.apache.sling.caconfig.management.ConfigurationData; +import org.apache.sling.caconfig.management.ConfigurationManager; import org.apache.sling.junit.rules.TeleporterRule; import org.apache.sling.resourcebuilder.api.ResourceBuilder; import org.apache.sling.resourcebuilder.api.ResourceBuilderFactory; Copied: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/ConfigurationMetadataProviderIT.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationMetadataProviderIT.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/ConfigurationMetadataProviderIT.java?p2=sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/ConfigurationMetadataProviderIT.java&p1=sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationMetadataProviderIT.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationMetadataProviderIT.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/ConfigurationMetadataProviderIT.java Fri Oct 14 21:38:06 2016 @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.contextaware.config.it; +package org.apache.sling.caconfig.it; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.apache.sling.contextaware.config.it.example.SimpleConfig; -import org.apache.sling.contextaware.config.spi.ConfigurationMetadataProvider; -import org.apache.sling.contextaware.config.spi.metadata.ConfigurationMetadata; +import org.apache.sling.caconfig.it.example.SimpleConfig; +import org.apache.sling.caconfig.spi.ConfigurationMetadataProvider; +import org.apache.sling.caconfig.spi.metadata.ConfigurationMetadata; import org.apache.sling.junit.rules.TeleporterRule; import org.junit.Rule; import org.junit.Test; Copied: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/ConfigurationResolverConfigClassIT.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverConfigClassIT.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/ConfigurationResolverConfigClassIT.java?p2=sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/ConfigurationResolverConfigClassIT.java&p1=sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverConfigClassIT.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverConfigClassIT.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/ConfigurationResolverConfigClassIT.java Fri Oct 14 21:38:06 2016 @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.contextaware.config.it; +package org.apache.sling.caconfig.it; -import static org.apache.sling.contextaware.config.it.TestUtils.CONFIG_ROOT_PATH; -import static org.apache.sling.contextaware.config.it.TestUtils.CONTENT_ROOT_PATH; -import static org.apache.sling.contextaware.config.it.TestUtils.cleanUp; +import static org.apache.sling.caconfig.it.TestUtils.CONFIG_ROOT_PATH; +import static org.apache.sling.caconfig.it.TestUtils.CONTENT_ROOT_PATH; +import static org.apache.sling.caconfig.it.TestUtils.cleanUp; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -26,8 +26,8 @@ import static org.junit.Assert.assertNul 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.ConfigurationResolver; -import org.apache.sling.contextaware.config.it.example.SimpleConfig; +import org.apache.sling.caconfig.ConfigurationResolver; +import org.apache.sling.caconfig.it.example.SimpleConfig; import org.apache.sling.junit.rules.TeleporterRule; import org.apache.sling.resourcebuilder.api.ResourceBuilder; import org.apache.sling.resourcebuilder.api.ResourceBuilderFactory; Copied: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/ConfigurationResolverValueMapIT.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverValueMapIT.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/ConfigurationResolverValueMapIT.java?p2=sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/ConfigurationResolverValueMapIT.java&p1=sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverValueMapIT.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverValueMapIT.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/ConfigurationResolverValueMapIT.java Fri Oct 14 21:38:06 2016 @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.contextaware.config.it; +package org.apache.sling.caconfig.it; -import static org.apache.sling.contextaware.config.it.TestUtils.CONFIG_ROOT_PATH; -import static org.apache.sling.contextaware.config.it.TestUtils.CONTENT_ROOT_PATH; -import static org.apache.sling.contextaware.config.it.TestUtils.cleanUp; +import static org.apache.sling.caconfig.it.TestUtils.CONFIG_ROOT_PATH; +import static org.apache.sling.caconfig.it.TestUtils.CONTENT_ROOT_PATH; +import static org.apache.sling.caconfig.it.TestUtils.cleanUp; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -27,7 +27,7 @@ import org.apache.sling.api.resource.Res import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.api.resource.ValueMap; -import org.apache.sling.contextaware.config.ConfigurationResolver; +import org.apache.sling.caconfig.ConfigurationResolver; import org.apache.sling.junit.rules.TeleporterRule; import org.apache.sling.resourcebuilder.api.ResourceBuilder; import org.apache.sling.resourcebuilder.api.ResourceBuilderFactory; Copied: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/TestUtils.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/TestUtils.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/TestUtils.java?p2=sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/TestUtils.java&p1=sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/TestUtils.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/TestUtils.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/TestUtils.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.it; +package org.apache.sling.caconfig.it; import org.apache.sling.api.resource.PersistenceException; import org.apache.sling.api.resource.Resource; Modified: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/example/SimpleConfig.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/example/SimpleConfig.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/example/SimpleConfig.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/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.it.example; +package org.apache.sling.caconfig.it.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/integration-tests/src/test/java/org/apache/sling/junit/teleporter/customizers/ITCustomizer.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/junit/teleporter/customizers/ITCustomizer.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/junit/teleporter/customizers/ITCustomizer.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/junit/teleporter/customizers/ITCustomizer.java Fri Oct 14 21:38:06 2016 @@ -29,12 +29,12 @@ public class ITCustomizer implements Tel final ClientSideTeleporter cst = (ClientSideTeleporter)t; cst.setBaseUrl(System.getProperty(BASE_URL_PROP, BASE_URL_PROP + "_IS_NOT_SET")); cst.setServerCredentials("admin", "admin"); - cst.includeDependencyPrefix("org.apache.sling.contextaware.config.it"); + cst.includeDependencyPrefix("org.apache.sling.caconfig.it"); cst.setTestReadyTimeoutSeconds(TimeoutsProvider.getInstance().getTimeout(10)); // list all configuration annotation classes here (separated by ",") cst.getAdditionalBundleHeaders().put("Sling-ContextAware-Configuration-Classes", - "org.apache.sling.contextaware.config.it.example.SimpleConfig"); + "org.apache.sling.caconfig.it.example.SimpleConfig"); } } Modified: sling/trunk/contrib/extensions/contextaware-config/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/pom.xml?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/pom.xml (original) +++ sling/trunk/contrib/extensions/contextaware-config/pom.xml Fri Oct 14 21:38:06 2016 @@ -27,9 +27,9 @@ <relativePath/> </parent> - <artifactId>org.apache.sling.contextaware-config.reactor</artifactId> + <artifactId>org.apache.sling.caconfig.reactor</artifactId> <packaging>pom</packaging> - <version>0.0.1-SNAPSHOT</version> + <version>1-SNAPSHOT</version> <name>Apache Sling Context-Aware Configuration Reactor</name> <description>Sling Context-Aware Configuration handling</description> Modified: sling/trunk/contrib/extensions/contextaware-config/spi/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/spi/pom.xml?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/spi/pom.xml (original) +++ sling/trunk/contrib/extensions/contextaware-config/spi/pom.xml Fri Oct 14 21:38:06 2016 @@ -27,7 +27,7 @@ <relativePath /> </parent> - <artifactId>org.apache.sling.contextaware.config.spi</artifactId> + <artifactId>org.apache.sling.caconfig.spi</artifactId> <packaging>bundle</packaging> <version>1.0.0-SNAPSHOT</version> <name>Apache Sling Context-Aware Configuration SPI</name> @@ -52,7 +52,7 @@ <dependencies> <dependency> <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.contextaware.config.api</artifactId> + <artifactId>org.apache.sling.caconfig.api</artifactId> <version>1.0.0-SNAPSHOT</version> <scope>provided</scope> </dependency> Modified: sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/ConfigurationResourceResolvingStrategy.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/ConfigurationResourceResolvingStrategy.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/ConfigurationResourceResolvingStrategy.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/ConfigurationResourceResolvingStrategy.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.spi; +package org.apache.sling.caconfig.resource.spi; import java.util.Collection; Modified: sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/ContextPathStrategy.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/ContextPathStrategy.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/ContextPathStrategy.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/ContextPathStrategy.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.spi; +package org.apache.sling.caconfig.resource.spi; import java.util.Iterator; Modified: sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/ContextResource.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/ContextResource.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/ContextResource.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/ContextResource.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.spi; +package org.apache.sling.caconfig.resource.spi; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; Modified: sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/package-info.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/package-info.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/package-info.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/package-info.java Fri Oct 14 21:38:06 2016 @@ -20,4 +20,4 @@ * SPI for applications hooking into the configuration resource infrastructure for parameterizing and customizing. */ @org.osgi.annotation.versioning.Version("1.0.0") -package org.apache.sling.contextaware.config.resource.spi; +package org.apache.sling.caconfig.resource.spi; Copied: sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/ConfigurationMetadataProvider.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationMetadataProvider.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/ConfigurationMetadataProvider.java?p2=sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/ConfigurationMetadataProvider.java&p1=sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationMetadataProvider.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationMetadataProvider.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/ConfigurationMetadataProvider.java Fri Oct 14 21:38:06 2016 @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.contextaware.config.spi; +package org.apache.sling.caconfig.spi; import java.util.SortedSet; import javax.annotation.Nonnull; -import org.apache.sling.contextaware.config.spi.metadata.ConfigurationMetadata; +import org.apache.sling.caconfig.spi.metadata.ConfigurationMetadata; import org.osgi.annotation.versioning.ConsumerType; /** Copied: sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/ConfigurationPersistenceException.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationPersistenceException.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/ConfigurationPersistenceException.java?p2=sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/ConfigurationPersistenceException.java&p1=sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationPersistenceException.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationPersistenceException.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/ConfigurationPersistenceException.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.spi; +package org.apache.sling.caconfig.spi; import org.osgi.annotation.versioning.ProviderType; Copied: sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/ConfigurationPersistenceStrategy.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationPersistenceStrategy.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/ConfigurationPersistenceStrategy.java?p2=sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/ConfigurationPersistenceStrategy.java&p1=sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationPersistenceStrategy.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationPersistenceStrategy.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/ConfigurationPersistenceStrategy.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.spi; +package org.apache.sling.caconfig.spi; import java.util.Collection; import java.util.Map; Modified: sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/AbstractMetadata.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/AbstractMetadata.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/AbstractMetadata.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/AbstractMetadata.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.spi.metadata; +package org.apache.sling.caconfig.spi.metadata; import java.util.Map; Modified: sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/ConfigurationMetadata.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/ConfigurationMetadata.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/ConfigurationMetadata.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/ConfigurationMetadata.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.spi.metadata; +package org.apache.sling.caconfig.spi.metadata; import java.util.Map; Modified: sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadata.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadata.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadata.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadata.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.spi.metadata; +package org.apache.sling.caconfig.spi.metadata; import java.util.Arrays; import java.util.Collections; Modified: sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/package-info.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/package-info.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/package-info.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/package-info.java Fri Oct 14 21:38:06 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.contextaware.config.spi.metadata; +package org.apache.sling.caconfig.spi.metadata; Copied: sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/package-info.java (from r1764963, sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/contextaware/config/spi/package-info.java) URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/package-info.java?p2=sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/package-info.java&p1=sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/contextaware/config/spi/package-info.java&r1=1764963&r2=1764966&rev=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/contextaware/config/spi/package-info.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/package-info.java Fri Oct 14 21:38:06 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.contextaware.config.spi; +package org.apache.sling.caconfig.spi; Modified: sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/resource/spi/ContextResourceTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/resource/spi/ContextResourceTest.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/resource/spi/ContextResourceTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/resource/spi/ContextResourceTest.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.spi; +package org.apache.sling.caconfig.resource.spi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; Modified: sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/spi/metadata/ConfigurationMetadataTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/spi/metadata/ConfigurationMetadataTest.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/spi/metadata/ConfigurationMetadataTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/spi/metadata/ConfigurationMetadataTest.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.spi.metadata; +package org.apache.sling.caconfig.spi.metadata; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; Modified: sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadataTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadataTest.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadataTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadataTest.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.spi.metadata; +package org.apache.sling.caconfig.spi.metadata; import static org.junit.Assert.assertEquals; Modified: sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/pom.xml?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/pom.xml (original) +++ sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/pom.xml Fri Oct 14 21:38:06 2016 @@ -27,9 +27,9 @@ <relativePath /> </parent> - <artifactId>org.apache.sling.contextaware.config.bnd-plugin-integration-tests</artifactId> + <artifactId>org.apache.sling.caconfig.bnd-plugin-integration-tests</artifactId> <packaging>bundle</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1-SNAPSHOT</version> <name>Apache Sling Context-Aware Configuration bnd Plugin Integration Tests</name> <description>Project to test the bnd Plugin</description> @@ -56,13 +56,13 @@ <exportScr>true</exportScr> <instructions> <!-- Generate bundle header containing all configuration annotation classes --> - <_plugin>org.apache.sling.contextaware.config.bndplugin.ConfigurationClassScannerPlugin</_plugin> + <_plugin>org.apache.sling.caconfig.bndplugin.ConfigurationClassScannerPlugin</_plugin> </instructions> </configuration> <dependencies> <dependency> <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.contextaware.config.bnd-plugin</artifactId> + <artifactId>org.apache.sling.caconfig.bnd-plugin</artifactId> <version>1.0.0-SNAPSHOT</version> </dependency> </dependencies> @@ -99,7 +99,7 @@ <dependencies> <dependency> <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.contextaware.config.api</artifactId> + <artifactId>org.apache.sling.caconfig.api</artifactId> <version>1.0.0-SNAPSHOT</version> <scope>compile</scope> </dependency> Modified: sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/MetadataSimpleConfig.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/MetadataSimpleConfig.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/MetadataSimpleConfig.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/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.bndplugintest; +package org.apache.sling.caconfig.bndplugintest; -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/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/NestedConfig.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/NestedConfig.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/NestedConfig.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/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.bndplugintest; +package org.apache.sling.caconfig.bndplugintest; -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/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/SimpleConfig.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/SimpleConfig.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/SimpleConfig.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/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.bndplugintest; +package org.apache.sling.caconfig.bndplugintest; -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/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/WithoutAnnotationConfig.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/WithoutAnnotationConfig.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/WithoutAnnotationConfig.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/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.bndplugintest; +package org.apache.sling.caconfig.bndplugintest; /** * Annotation classes without the proper Configuration annotation are not supported. Modified: sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/test/java/org/apache/sling/caconfig/bndplugintest/HeaderIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/test/java/org/apache/sling/caconfig/bndplugintest/HeaderIT.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/test/java/org/apache/sling/caconfig/bndplugintest/HeaderIT.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/test/java/org/apache/sling/caconfig/bndplugintest/HeaderIT.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.bndplugintest; +package org.apache.sling.caconfig.bndplugintest; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -43,10 +43,10 @@ public class HeaderIT { Set<String> classNames = new HashSet<>(Arrays.asList(classesHeader.split(","))); - assertTrue(classNames.contains("org.apache.sling.contextaware.config.bndplugintest.MetadataSimpleConfig")); - assertTrue(classNames.contains("org.apache.sling.contextaware.config.bndplugintest.NestedConfig")); - assertTrue(classNames.contains("org.apache.sling.contextaware.config.bndplugintest.SimpleConfig")); - assertFalse(classNames.contains("org.apache.sling.contextaware.config.bndplugintest.WithoutAnnotationConfig")); + assertTrue(classNames.contains("org.apache.sling.caconfig.bndplugintest.MetadataSimpleConfig")); + assertTrue(classNames.contains("org.apache.sling.caconfig.bndplugintest.NestedConfig")); + assertTrue(classNames.contains("org.apache.sling.caconfig.bndplugintest.SimpleConfig")); + assertFalse(classNames.contains("org.apache.sling.caconfig.bndplugintest.WithoutAnnotationConfig")); } } Modified: sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin/pom.xml?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin/pom.xml (original) +++ sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin/pom.xml Fri Oct 14 21:38:06 2016 @@ -27,7 +27,7 @@ <relativePath /> </parent> - <artifactId>org.apache.sling.contextaware.config.bnd-plugin</artifactId> + <artifactId>org.apache.sling.caconfig.bnd-plugin</artifactId> <packaging>jar</packaging> <version>1.0.0-SNAPSHOT</version> <name>Apache Sling Context-Aware Configuration bnd Plugin</name> Modified: sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin/src/main/java/org/apache/sling/caconfig/bndplugin/ConfigurationClassScannerPlugin.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin/src/main/java/org/apache/sling/caconfig/bndplugin/ConfigurationClassScannerPlugin.java?rev=1764966&r1=1764965&r2=1764966&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin/src/main/java/org/apache/sling/caconfig/bndplugin/ConfigurationClassScannerPlugin.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin/src/main/java/org/apache/sling/caconfig/bndplugin/ConfigurationClassScannerPlugin.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.bndplugin; +package org.apache.sling.caconfig.bndplugin; import java.util.ArrayList; import java.util.Collection; @@ -40,7 +40,7 @@ import aQute.service.reporter.Reporter; */ public class ConfigurationClassScannerPlugin implements AnalyzerPlugin, Plugin { - private static final String CONFIGURATION_ANNOTATION_CLASS = "org.apache.sling.contextaware.config.annotation.Configuration"; + private static final String CONFIGURATION_ANNOTATION_CLASS = "org.apache.sling.caconfig.annotation.Configuration"; private static final String CONFIGURATION_CLASSES_HEADER = "Sling-ContextAware-Configuration-Classes";
