Author: sseifert
Date: Fri Oct 14 21:38:06 2016
New Revision: 1764966
URL: http://svn.apache.org/viewvc?rev=1764966&view=rev
Log:
SLING-6157 Context-Aware Config: Change java package name to o.a.s.caconfig
Added:
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/ConfigurationBuilder.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationBuilder.java
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/ConfigurationResolveException.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationResolveException.java
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/ConfigurationResolver.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationResolver.java
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/annotation/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/contextaware/config/annotation/
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/package-info.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/contextaware/config/package-info.java
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/resource/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/contextaware/config/resource/
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderAdapterFactory.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationBuilderAdapterFactory.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationBuilderImpl.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationNameConstants.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationNameConstants.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationProxy.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationProxy.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResolverImpl.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverImpl.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/def/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/def/
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/metadata/
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationData.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/management/ConfigurationData.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationManager.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/management/ConfigurationManager.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/ValueInfo.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/management/ValueInfo.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/management/impl/
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/package-info.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/management/package-info.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolverImpl.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolverImpl.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolvingStrategyMultiplexer.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolvingStrategyMultiplexer.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/ContextPathStrategyMultiplexer.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/ContextPathStrategyMultiplexer.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/util/
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/example/
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationBuilderAdapterFactoryTest.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationBuilderAdapterFactoryTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationProxyCachingInvocationHandlerTest.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationProxyCachingInvocationHandlerTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationProxyTest.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationProxyTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverAdaptableTest.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverAdaptableTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverAnnotationClassTest.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverAnnotationClassTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverCustomPersistenceTest.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverCustomPersistenceTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationResolverValueMapTest.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverValueMapTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/ConfigurationTestUtils.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationTestUtils.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/def/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/def/
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/metadata/
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/management/impl/
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolverImplTest.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolverImplTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolvingStrategyMultiplexerTest.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolvingStrategyMultiplexerTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceTestUtils.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceTestUtils.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/ContextPathStrategyMultiplexerTest.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/ContextPathStrategyMultiplexerTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/def/
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/resource/impl/util/
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/AdaptToConfigClassIT.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/AdaptToConfigClassIT.java
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/ConfigurationManagerIT.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationManagerIT.java
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/ConfigurationMetadataProviderIT.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationMetadataProviderIT.java
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/ConfigurationResolverConfigClassIT.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverConfigClassIT.java
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/ConfigurationResolverValueMapIT.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverValueMapIT.java
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/TestUtils.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/TestUtils.java
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/example/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/example/
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/contextaware/config/resource/spi/
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/ConfigurationMetadataProvider.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationMetadataProvider.java
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/ConfigurationPersistenceException.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationPersistenceException.java
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/ConfigurationPersistenceStrategy.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/contextaware/config/spi/ConfigurationPersistenceStrategy.java
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/contextaware/config/spi/metadata/
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/package-info.java
- copied, changed from r1764963,
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/contextaware/config/spi/package-info.java
sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/
sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/resource/
sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/resource/spi/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/contextaware/config/resource/spi/
sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/spi/
sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/spi/metadata/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/contextaware/config/spi/metadata/
sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/
sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/contextaware/config/bndplugintest/
sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/test/java/org/apache/sling/caconfig/
sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/test/java/org/apache/sling/caconfig/bndplugintest/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/test/java/org/apache/sling/contextaware/config/bndplugintest/
sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin/src/main/java/org/apache/sling/caconfig/
sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin/src/main/java/org/apache/sling/caconfig/bndplugin/
- copied from r1764965,
sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin/src/main/java/org/apache/sling/contextaware/config/bndplugin/
Removed:
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/contextaware/
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/contextaware/
sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/contextaware/
sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/contextaware/
sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/test/java/org/apache/sling/contextaware/
sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin/src/main/java/org/apache/sling/contextaware/
Modified:
sling/trunk/contrib/extensions/contextaware-config/api/pom.xml
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/annotation/Configuration.java
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/annotation/Property.java
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/annotation/package-info.java
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/resource/ConfigurationResourceResolver.java
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/resource/package-info.java
sling/trunk/contrib/extensions/contextaware-config/impl/pom.xml
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategy.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassConfigurationMetadataProvider.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassParser.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/BundleConfigurationMapping.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/ConfigClassBundleTackerCustomizer.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/ConfigurationMapping.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/ConfigurationMetadataProviderMultiplexer.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexer.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ValueInfoImpl.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/ConfigurationResourceNameConstants.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/ConfigurationResourceWrapper.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultContextPathStrategy.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/WebConsolePlugin.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/PathEliminateDuplicatesIterator.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/PathParentExpandIterator.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/ResourceEliminateDuplicatesIterator.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/ResourcePathCollatingIterator.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/AllTypesConfig.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/AllTypesDefaults.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/IllegalTypesConfig.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/ListConfig.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/MetadataSimpleConfig.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/NestedConfig.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/SimpleConfig.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/SimpleSlingModel.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/SpecialNamesConfig.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/example/WithoutAnnotationConfig.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/def/ConfigurationResolverPropertyInheritanceTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategyTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassConfigurationMetadataProviderTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassParserTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/BundleEventUtil.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/impl/metadata/ConfigurationMetadataProviderMultiplexerTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImplTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplCustomPersistenceTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImplTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexerTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/CustomConfigurationPersistenceStrategy.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/management/impl/ValueInfoImplTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategyHierarchyTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategyTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/def/DefaultContextPathStrategyTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/ContextResourceTestUtil.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/PathEliminateDuplicatesIteratorTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/PathParentExpandIteratorTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/ResourceEliminateDuplicatesIteratorTest.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/ResourcePathCollatingIteratorTest.java
sling/trunk/contrib/extensions/contextaware-config/integration-tests/pom.xml
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/main/provisioning/integration-tests.txt
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/caconfig/it/example/SimpleConfig.java
sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/junit/teleporter/customizers/ITCustomizer.java
sling/trunk/contrib/extensions/contextaware-config/pom.xml
sling/trunk/contrib/extensions/contextaware-config/spi/pom.xml
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/ConfigurationResourceResolvingStrategy.java
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/ContextPathStrategy.java
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/ContextResource.java
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/package-info.java
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/AbstractMetadata.java
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/ConfigurationMetadata.java
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadata.java
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/spi/metadata/package-info.java
sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/resource/spi/ContextResourceTest.java
sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/spi/metadata/ConfigurationMetadataTest.java
sling/trunk/contrib/extensions/contextaware-config/spi/src/test/java/org/apache/sling/caconfig/spi/metadata/PropertyMetadataTest.java
sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/pom.xml
sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/MetadataSimpleConfig.java
sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/NestedConfig.java
sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/SimpleConfig.java
sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/main/java/org/apache/sling/caconfig/bndplugintest/WithoutAnnotationConfig.java
sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin-integration-tests/src/test/java/org/apache/sling/caconfig/bndplugintest/HeaderIT.java
sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin/pom.xml
sling/trunk/contrib/extensions/contextaware-config/tooling/bnd-plugin/src/main/java/org/apache/sling/caconfig/bndplugin/ConfigurationClassScannerPlugin.java
Modified: sling/trunk/contrib/extensions/contextaware-config/api/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/api/pom.xml?rev=1764966&r1=1764965&r2=1764966&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/api/pom.xml (original)
+++ sling/trunk/contrib/extensions/contextaware-config/api/pom.xml Fri Oct 14
21:38:06 2016
@@ -27,7 +27,7 @@
<relativePath />
</parent>
- <artifactId>org.apache.sling.contextaware.config.api</artifactId>
+ <artifactId>org.apache.sling.caconfig.api</artifactId>
<packaging>bundle</packaging>
<version>1.0.0-SNAPSHOT</version>
<name>Apache Sling Context-Aware Configuration API</name>
Copied:
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/ConfigurationBuilder.java
(from r1764963,
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationBuilder.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/ConfigurationBuilder.java?p2=sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/ConfigurationBuilder.java&p1=sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationBuilder.java&r1=1764963&r2=1764966&rev=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationBuilder.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/ConfigurationBuilder.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;
+package org.apache.sling.caconfig;
import java.util.Collection;
Copied:
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/ConfigurationResolveException.java
(from r1764963,
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationResolveException.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/ConfigurationResolveException.java?p2=sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/ConfigurationResolveException.java&p1=sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationResolveException.java&r1=1764963&r2=1764966&rev=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationResolveException.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/ConfigurationResolveException.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;
+package org.apache.sling.caconfig;
import org.osgi.annotation.versioning.ProviderType;
Copied:
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/ConfigurationResolver.java
(from r1764963,
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationResolver.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/ConfigurationResolver.java?p2=sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/ConfigurationResolver.java&p1=sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationResolver.java&r1=1764963&r2=1764966&rev=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/contextaware/config/ConfigurationResolver.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/ConfigurationResolver.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;
+package org.apache.sling.caconfig;
import javax.annotation.Nonnull;
@@ -28,7 +28,7 @@ import org.osgi.annotation.versioning.Pr
* Context-specific configuration may be different for different parts of the
resource
* hierarchy, and configuration parameter inheritance may take place.
*
- * This service builds on top of the {@link
org.apache.sling.contextaware.config.resource.ConfigurationResourceResolver}
+ * This service builds on top of the {@link
org.apache.sling.caconfig.resource.ConfigurationResourceResolver}
* and uses that service to resolve configuration resources. These resources
* can then be converted into application specific configuration objects
* using the {@link ConfigurationBuilder}.
Modified:
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/annotation/Configuration.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/annotation/Configuration.java?rev=1764966&r1=1764965&r2=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/annotation/Configuration.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/annotation/Configuration.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.annotation;
+package org.apache.sling.caconfig.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified:
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/annotation/Property.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/annotation/Property.java?rev=1764966&r1=1764965&r2=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/annotation/Property.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/annotation/Property.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.annotation;
+package org.apache.sling.caconfig.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified:
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/annotation/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/annotation/package-info.java?rev=1764966&r1=1764965&r2=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/annotation/package-info.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/annotation/package-info.java
Fri Oct 14 21:38:06 2016
@@ -20,4 +20,4 @@
* Annotations for context-aware configurations.
*/
@org.osgi.annotation.versioning.Version("1.0.0")
-package org.apache.sling.contextaware.config.annotation;
+package org.apache.sling.caconfig.annotation;
Copied:
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/package-info.java
(from r1764963,
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/contextaware/config/package-info.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/package-info.java?p2=sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/package-info.java&p1=sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/contextaware/config/package-info.java&r1=1764963&r2=1764966&rev=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/contextaware/config/package-info.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/package-info.java
Fri Oct 14 21:38:06 2016
@@ -20,4 +20,4 @@
* API for accessing context-aware configuration.
*/
@org.osgi.annotation.versioning.Version("1.0.0")
-package org.apache.sling.contextaware.config;
+package org.apache.sling.caconfig;
Modified:
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/resource/ConfigurationResourceResolver.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/resource/ConfigurationResourceResolver.java?rev=1764966&r1=1764965&r2=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/resource/ConfigurationResourceResolver.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/resource/ConfigurationResourceResolver.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;
+package org.apache.sling.caconfig.resource;
import java.util.Collection;
@@ -29,7 +29,7 @@ import org.osgi.annotation.versioning.Pr
/**
* Getting context-aware configuration resources for a given resource context.
* This is a low-level interface for supporting advanced use cases. If you
just want to fetch
- * some configuration parameters {@link
org.apache.sling.contextaware.config.ConfigurationResolver}
+ * some configuration parameters {@link
org.apache.sling.caconfig.ConfigurationResolver}
* is the right place.
*/
@ProviderType
Modified:
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/resource/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/resource/package-info.java?rev=1764966&r1=1764965&r2=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/resource/package-info.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/api/src/main/java/org/apache/sling/caconfig/resource/package-info.java
Fri Oct 14 21:38:06 2016
@@ -21,4 +21,4 @@
* This is a low-level API.
*/
@org.osgi.annotation.versioning.Version("1.0.0")
-package org.apache.sling.contextaware.config.resource;
+package org.apache.sling.caconfig.resource;
Modified: sling/trunk/contrib/extensions/contextaware-config/impl/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/pom.xml?rev=1764966&r1=1764965&r2=1764966&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/impl/pom.xml (original)
+++ sling/trunk/contrib/extensions/contextaware-config/impl/pom.xml Fri Oct 14
21:38:06 2016
@@ -27,7 +27,7 @@
<relativePath />
</parent>
- <artifactId>org.apache.sling.contextaware.config.impl</artifactId>
+ <artifactId>org.apache.sling.caconfig.impl</artifactId>
<packaging>bundle</packaging>
<version>1.0.0-SNAPSHOT</version>
<name>Apache Sling Context-Aware Configuration Implementation</name>
@@ -78,13 +78,13 @@
</dependency>
<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>
Copied:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderAdapterFactory.java
(from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationBuilderAdapterFactory.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderAdapterFactory.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderAdapterFactory.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationBuilderAdapterFactory.java&r1=1764963&r2=1764966&rev=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationBuilderAdapterFactory.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderAdapterFactory.java
Fri Oct 14 21:38:06 2016
@@ -16,19 +16,19 @@
* 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.api.adapter.AdapterFactory;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.contextaware.config.ConfigurationBuilder;
-import org.apache.sling.contextaware.config.ConfigurationResolver;
+import org.apache.sling.caconfig.ConfigurationBuilder;
+import org.apache.sling.caconfig.ConfigurationResolver;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferencePolicyOption;
@Component(service=AdapterFactory.class,
property={
- AdapterFactory.ADAPTER_CLASSES +
"=org.apache.sling.contextaware.config.ConfigurationBuilder",
+ AdapterFactory.ADAPTER_CLASSES +
"=org.apache.sling.caconfig.ConfigurationBuilder",
AdapterFactory.ADAPTABLE_CLASSES +
"=org.apache.sling.api.resource.Resource"
})
public class ConfigurationBuilderAdapterFactory implements AdapterFactory {
Copied:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
(from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationBuilderImpl.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationBuilderImpl.java&r1=1764963&r2=1764966&rev=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationBuilderImpl.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.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.impl.ConfigurationNameConstants.CONFIGS_PARENT_NAME;
+import static
org.apache.sling.caconfig.impl.ConfigurationNameConstants.CONFIGS_PARENT_NAME;
import java.util.ArrayList;
import java.util.Collection;
@@ -28,13 +28,13 @@ import org.apache.commons.lang3.StringUt
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.ValueMap;
-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.impl.ConfigurationProxy.ChildResolver;
-import
org.apache.sling.contextaware.config.impl.metadata.AnnotationClassParser;
-import
org.apache.sling.contextaware.config.resource.ConfigurationResourceResolver;
-import
org.apache.sling.contextaware.config.spi.ConfigurationPersistenceStrategy;
+import org.apache.sling.caconfig.ConfigurationBuilder;
+import org.apache.sling.caconfig.ConfigurationResolveException;
+import org.apache.sling.caconfig.ConfigurationResolver;
+import org.apache.sling.caconfig.impl.ConfigurationProxy.ChildResolver;
+import org.apache.sling.caconfig.impl.metadata.AnnotationClassParser;
+import org.apache.sling.caconfig.resource.ConfigurationResourceResolver;
+import org.apache.sling.caconfig.spi.ConfigurationPersistenceStrategy;
class ConfigurationBuilderImpl implements ConfigurationBuilder {
Copied:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationNameConstants.java
(from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationNameConstants.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationNameConstants.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationNameConstants.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationNameConstants.java&r1=1764963&r2=1764966&rev=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationNameConstants.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationNameConstants.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;
public final class ConfigurationNameConstants {
Copied:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationProxy.java
(from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationProxy.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationProxy.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationProxy.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationProxy.java&r1=1764963&r2=1764966&rev=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationProxy.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationProxy.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 java.lang.reflect.Array;
import java.lang.reflect.InvocationHandler;
@@ -32,9 +32,9 @@ import javax.annotation.Nullable;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.contextaware.config.ConfigurationResolveException;
-import
org.apache.sling.contextaware.config.impl.metadata.AnnotationClassParser;
-import org.apache.sling.contextaware.config.spi.metadata.PropertyMetadata;
+import org.apache.sling.caconfig.ConfigurationResolveException;
+import org.apache.sling.caconfig.impl.metadata.AnnotationClassParser;
+import org.apache.sling.caconfig.spi.metadata.PropertyMetadata;
/**
* Maps the property of a resource to a dynamic proxy object implementing
Copied:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResolverImpl.java
(from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverImpl.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResolverImpl.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResolverImpl.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverImpl.java&r1=1764963&r2=1764966&rev=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverImpl.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResolverImpl.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.impl;
+package org.apache.sling.caconfig.impl;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.contextaware.config.ConfigurationBuilder;
-import org.apache.sling.contextaware.config.ConfigurationResolver;
-import
org.apache.sling.contextaware.config.management.impl.ConfigurationPersistenceStrategyMultiplexer;
-import
org.apache.sling.contextaware.config.resource.ConfigurationResourceResolver;
+import org.apache.sling.caconfig.ConfigurationBuilder;
+import org.apache.sling.caconfig.ConfigurationResolver;
+import
org.apache.sling.caconfig.management.impl.ConfigurationPersistenceStrategyMultiplexer;
+import org.apache.sling.caconfig.resource.ConfigurationResourceResolver;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategy.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategy.java?rev=1764966&r1=1764965&r2=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategy.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/def/DefaultConfigurationPersistenceStrategy.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 java.util.Collection;
import java.util.HashSet;
@@ -29,8 +29,8 @@ 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;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassConfigurationMetadataProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassConfigurationMetadataProvider.java?rev=1764966&r1=1764965&r2=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassConfigurationMetadataProvider.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassConfigurationMetadataProvider.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.impl.metadata;
+package org.apache.sling.caconfig.impl.metadata;
import java.util.Collections;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentSkipListMap;
-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.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.annotations.Activate;
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassParser.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassParser.java?rev=1764966&r1=1764965&r2=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassParser.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/AnnotationClassParser.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 java.lang.reflect.Method;
import java.util.Collections;
@@ -26,10 +26,10 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
-import org.apache.sling.contextaware.config.annotation.Configuration;
-import org.apache.sling.contextaware.config.annotation.Property;
-import org.apache.sling.contextaware.config.spi.metadata.ConfigurationMetadata;
-import org.apache.sling.contextaware.config.spi.metadata.PropertyMetadata;
+import org.apache.sling.caconfig.annotation.Configuration;
+import org.apache.sling.caconfig.annotation.Property;
+import org.apache.sling.caconfig.spi.metadata.ConfigurationMetadata;
+import org.apache.sling.caconfig.spi.metadata.PropertyMetadata;
/**
* Helper methods for parsing metadata from configuration annotation classes.
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/BundleConfigurationMapping.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/BundleConfigurationMapping.java?rev=1764966&r1=1764965&r2=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/BundleConfigurationMapping.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/BundleConfigurationMapping.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 java.util.HashMap;
import java.util.Map;
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/ConfigClassBundleTackerCustomizer.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/ConfigClassBundleTackerCustomizer.java?rev=1764966&r1=1764965&r2=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/ConfigClassBundleTackerCustomizer.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/ConfigClassBundleTackerCustomizer.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.util.Dictionary;
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/ConfigurationMapping.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/ConfigurationMapping.java?rev=1764966&r1=1764965&r2=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/ConfigurationMapping.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/ConfigurationMapping.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 org.apache.sling.contextaware.config.spi.metadata.ConfigurationMetadata;
+import org.apache.sling.caconfig.spi.metadata.ConfigurationMetadata;
/**
* Contains mapping of configuration class to metadata parsed from it's fields
and annotations.
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/ConfigurationMetadataProviderMultiplexer.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/ConfigurationMetadataProviderMultiplexer.java?rev=1764966&r1=1764965&r2=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/ConfigurationMetadataProviderMultiplexer.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/impl/metadata/ConfigurationMetadataProviderMultiplexer.java
Fri Oct 14 21:38:06 2016
@@ -16,16 +16,16 @@
* 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 java.util.Map;
import java.util.SortedSet;
import java.util.TreeSet;
+import org.apache.sling.caconfig.spi.ConfigurationMetadataProvider;
+import org.apache.sling.caconfig.spi.metadata.ConfigurationMetadata;
import org.apache.sling.commons.osgi.Order;
import org.apache.sling.commons.osgi.RankedServices;
-import org.apache.sling.contextaware.config.spi.ConfigurationMetadataProvider;
-import org.apache.sling.contextaware.config.spi.metadata.ConfigurationMetadata;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
Copied:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationData.java
(from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/management/ConfigurationData.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationData.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationData.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/management/ConfigurationData.java&r1=1764963&r2=1764966&rev=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/management/ConfigurationData.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationData.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;
+package org.apache.sling.caconfig.management;
import java.util.Set;
Copied:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationManager.java
(from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/management/ConfigurationManager.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationManager.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationManager.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/management/ConfigurationManager.java&r1=1764963&r2=1764966&rev=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/management/ConfigurationManager.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationManager.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;
+package org.apache.sling.caconfig.management;
import java.util.Collection;
import java.util.Map;
@@ -29,8 +29,8 @@ import org.osgi.annotation.versioning.Pr
/**
* Manages reading and writing configurations e.g. for Editor GUIs.
- * It manages only configurations handled by {@link
org.apache.sling.contextaware.config.ConfigurationResolver},
- * no low-level configuration resources managed by {@link
org.apache.sling.contextaware.config.resource.ConfigurationResourceResolver}.
+ * It manages only configurations handled by {@link
org.apache.sling.caconfig.ConfigurationResolver},
+ * no low-level configuration resources managed by {@link
org.apache.sling.caconfig.resource.ConfigurationResourceResolver}.
*/
@ProviderType
public interface ConfigurationManager {
Copied:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/ValueInfo.java
(from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/management/ValueInfo.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/ValueInfo.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/ValueInfo.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/management/ValueInfo.java&r1=1764963&r2=1764966&rev=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/management/ValueInfo.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/ValueInfo.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.management;
+package org.apache.sling.caconfig.management;
import javax.annotation.CheckForNull;
-import org.apache.sling.contextaware.config.spi.metadata.PropertyMetadata;
+import org.apache.sling.caconfig.spi.metadata.PropertyMetadata;
import org.osgi.annotation.versioning.ProviderType;
/**
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java?rev=1764966&r1=1764965&r2=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationDataImpl.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.HashMap;
import java.util.HashSet;
@@ -26,10 +26,10 @@ import java.util.Set;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.api.wrappers.ValueMapDecorator;
-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;
final class ConfigurationDataImpl implements ConfigurationData {
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java?rev=1764966&r1=1764965&r2=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.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 java.util.ArrayList;
import java.util.Collection;
@@ -26,13 +26,13 @@ import java.util.List;
import java.util.Map;
import org.apache.sling.api.resource.Resource;
-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.spi.ConfigurationPersistenceException;
-import org.apache.sling.contextaware.config.spi.metadata.ConfigurationMetadata;
+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.spi.ConfigurationPersistenceException;
+import org.apache.sling.caconfig.spi.metadata.ConfigurationMetadata;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexer.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexer.java?rev=1764966&r1=1764965&r2=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexer.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationPersistenceStrategyMultiplexer.java
Fri Oct 14 21:38:06 2016
@@ -16,16 +16,16 @@
* 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.Map;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.caconfig.spi.ConfigurationPersistenceStrategy;
import org.apache.sling.commons.osgi.Order;
import org.apache.sling.commons.osgi.RankedServices;
-import
org.apache.sling.contextaware.config.spi.ConfigurationPersistenceStrategy;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ValueInfoImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ValueInfoImpl.java?rev=1764966&r1=1764965&r2=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ValueInfoImpl.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ValueInfoImpl.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.management.impl;
+package org.apache.sling.caconfig.management.impl;
import org.apache.commons.lang3.ObjectUtils;
-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;
final class ValueInfoImpl<T> implements ValueInfo<T> {
Copied:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/package-info.java
(from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/management/package-info.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/package-info.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/package-info.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/management/package-info.java&r1=1764963&r2=1764966&rev=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/management/package-info.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/package-info.java
Fri Oct 14 21:38:06 2016
@@ -22,4 +22,4 @@
* not for "normal" applications just reading configuration.
*/
@org.osgi.annotation.versioning.Version("1.0.0")
-package org.apache.sling.contextaware.config.management;
+package org.apache.sling.caconfig.management;
Copied:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolverImpl.java
(from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolverImpl.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolverImpl.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolverImpl.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolverImpl.java&r1=1764963&r2=1764966&rev=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolverImpl.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolverImpl.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;
+package org.apache.sling.caconfig.resource.impl;
import java.util.ArrayList;
import java.util.Collection;
@@ -24,8 +24,8 @@ import java.util.Iterator;
import java.util.List;
import org.apache.sling.api.resource.Resource;
-import
org.apache.sling.contextaware.config.resource.ConfigurationResourceResolver;
-import org.apache.sling.contextaware.config.resource.spi.ContextResource;
+import org.apache.sling.caconfig.resource.ConfigurationResourceResolver;
+import org.apache.sling.caconfig.resource.spi.ContextResource;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
Copied:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolvingStrategyMultiplexer.java
(from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolvingStrategyMultiplexer.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolvingStrategyMultiplexer.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolvingStrategyMultiplexer.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolvingStrategyMultiplexer.java&r1=1764963&r2=1764966&rev=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/ConfigurationResourceResolvingStrategyMultiplexer.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/ConfigurationResourceResolvingStrategyMultiplexer.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;
+package org.apache.sling.caconfig.resource.impl;
import java.util.ArrayList;
import java.util.Collection;
@@ -24,9 +24,9 @@ import java.util.List;
import java.util.Map;
import org.apache.sling.api.resource.Resource;
+import
org.apache.sling.caconfig.resource.spi.ConfigurationResourceResolvingStrategy;
import org.apache.sling.commons.osgi.Order;
import org.apache.sling.commons.osgi.RankedServices;
-import
org.apache.sling.contextaware.config.resource.spi.ConfigurationResourceResolvingStrategy;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
Copied:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/ContextPathStrategyMultiplexer.java
(from r1764963,
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/ContextPathStrategyMultiplexer.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/ContextPathStrategyMultiplexer.java?p2=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/ContextPathStrategyMultiplexer.java&p1=sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/ContextPathStrategyMultiplexer.java&r1=1764963&r2=1764966&rev=1764966&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/ContextPathStrategyMultiplexer.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/ContextPathStrategyMultiplexer.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;
+package org.apache.sling.caconfig.resource.impl;
import java.util.ArrayList;
import java.util.Collections;
@@ -25,12 +25,12 @@ import java.util.List;
import java.util.Map;
import org.apache.sling.api.resource.Resource;
+import
org.apache.sling.caconfig.resource.impl.util.ResourceEliminateDuplicatesIterator;
+import
org.apache.sling.caconfig.resource.impl.util.ResourcePathCollatingIterator;
+import org.apache.sling.caconfig.resource.spi.ContextPathStrategy;
+import org.apache.sling.caconfig.resource.spi.ContextResource;
import org.apache.sling.commons.osgi.Order;
import org.apache.sling.commons.osgi.RankedServices;
-import
org.apache.sling.contextaware.config.resource.impl.util.ResourceEliminateDuplicatesIterator;
-import
org.apache.sling.contextaware.config.resource.impl.util.ResourcePathCollatingIterator;
-import org.apache.sling.contextaware.config.resource.spi.ContextPathStrategy;
-import org.apache.sling.contextaware.config.resource.spi.ContextResource;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
