Author: sseifert
Date: Thu Oct 19 15:10:17 2017
New Revision: 1812646
URL: http://svn.apache.org/viewvc?rev=1812646&view=rev
Log:
SLING-7208 CAConfig Impl: Make ConfigurationResourceResolverConfig service
accessible from outside
Added:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationResourceResolverConfig.java
- copied, changed from r1812645,
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResourceResolverConfig.java
Removed:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResourceResolverConfig.java
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResolverImpl.java
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/package-info.java
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResolverImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResolverImpl.java?rev=1812646&r1=1812645&r2=1812646&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResolverImpl.java
(original)
+++
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResolverImpl.java
Thu Oct 19 15:10:17 2017
@@ -28,6 +28,7 @@ import org.apache.commons.lang3.ArrayUti
import org.apache.sling.api.resource.Resource;
import org.apache.sling.caconfig.ConfigurationBuilder;
import org.apache.sling.caconfig.ConfigurationResolver;
+import
org.apache.sling.caconfig.management.ConfigurationResourceResolverConfig;
import
org.apache.sling.caconfig.management.multiplexer.ConfigurationInheritanceStrategyMultiplexer;
import
org.apache.sling.caconfig.management.multiplexer.ConfigurationMetadataProviderMultiplexer;
import
org.apache.sling.caconfig.management.multiplexer.ConfigurationOverrideMultiplexer;
Copied:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationResourceResolverConfig.java
(from r1812645,
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResourceResolverConfig.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationResourceResolverConfig.java?p2=sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationResourceResolverConfig.java&p1=sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResourceResolverConfig.java&r1=1812645&r2=1812646&rev=1812646&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/impl/ConfigurationResourceResolverConfig.java
(original)
+++
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/ConfigurationResourceResolverConfig.java
Thu Oct 19 15:10:17 2017
@@ -16,15 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.caconfig.impl;
+package org.apache.sling.caconfig.management;
import java.util.Collection;
import javax.annotation.Nonnull;
+import org.osgi.annotation.versioning.ProviderType;
+
/**
- * Internal service for accessing the ConfigurationResourceResolver
configuration from other services.
+ * Service for accessing the ConfigurationResourceResolver configuration from
other services.
*/
+@ProviderType
public interface ConfigurationResourceResolverConfig {
/**
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java?rev=1812646&r1=1812645&r2=1812646&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java
(original)
+++
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationManagerImpl.java
Thu Oct 19 15:10:17 2017
@@ -36,11 +36,11 @@ import org.apache.commons.collections.it
import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.caconfig.impl.ConfigurationResourceResolverConfig;
import org.apache.sling.caconfig.management.ConfigurationCollectionData;
import org.apache.sling.caconfig.management.ConfigurationData;
import org.apache.sling.caconfig.management.ConfigurationManagementSettings;
import org.apache.sling.caconfig.management.ConfigurationManager;
+import
org.apache.sling.caconfig.management.ConfigurationResourceResolverConfig;
import
org.apache.sling.caconfig.management.multiplexer.ConfigurationInheritanceStrategyMultiplexer;
import
org.apache.sling.caconfig.management.multiplexer.ConfigurationMetadataProviderMultiplexer;
import
org.apache.sling.caconfig.management.multiplexer.ConfigurationOverrideMultiplexer;
Modified:
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/package-info.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/package-info.java?rev=1812646&r1=1812645&r2=1812646&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/package-info.java
(original)
+++
sling/trunk/bundles/extensions/caconfig/impl/src/main/java/org/apache/sling/caconfig/management/package-info.java
Thu Oct 19 15:10:17 2017
@@ -21,5 +21,5 @@
* This API is only indented for advanced use cases like writing a
configuration editor,
* not for "normal" applications just reading configuration.
*/
-@org.osgi.annotation.versioning.Version("2.1.0")
+@org.osgi.annotation.versioning.Version("2.2.0")
package org.apache.sling.caconfig.management;
