You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:17:06 UTC
[sling-org-apache-sling-testing-caconfig-mock-plugin] 07/12:
SLING-6670 Support CAConfig Impl 1.3.0
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.caconfig-mock-plugin-1.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-caconfig-mock-plugin.git
commit 4ae02b06ed73900e0072ecc427bf4160b454c783
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Sun Mar 19 15:49:42 2017 +0000
SLING-6670 Support CAConfig Impl 1.3.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/caconfig-mock-plugin@1787636 13f79535-47bb-0310-9956-ffa450edef68
---
.../testing/mock/caconfig/ContextPlugins.java | 40 +++++++++++-----------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java b/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java
index 6a24e0a..85f2bb1 100644
--- a/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java
+++ b/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java
@@ -22,10 +22,8 @@ import org.apache.sling.caconfig.impl.ConfigurationBuilderAdapterFactory;
import org.apache.sling.caconfig.impl.ConfigurationResolverImpl;
import org.apache.sling.caconfig.impl.def.DefaultConfigurationPersistenceStrategy;
import org.apache.sling.caconfig.impl.metadata.AnnotationClassConfigurationMetadataProvider;
-import org.apache.sling.caconfig.impl.metadata.ConfigurationMetadataProviderMultiplexer;
import org.apache.sling.caconfig.management.impl.ConfigurationManagerImpl;
import org.apache.sling.caconfig.resource.impl.ConfigurationResourceResolverImpl;
-import org.apache.sling.caconfig.resource.impl.ConfigurationResourceResolvingStrategyMultiplexer;
import org.apache.sling.caconfig.resource.impl.def.DefaultConfigurationResourceResolvingStrategy;
import org.apache.sling.caconfig.resource.impl.def.DefaultContextPathStrategy;
import org.apache.sling.testing.mock.osgi.context.AbstractContextPlugin;
@@ -81,10 +79,14 @@ public final class ContextPlugins {
if (!registerByClassName(context, "org.apache.sling.caconfig.management.impl.ContextPathStrategyMultiplexerImpl")) {
// fallback to impl 1.1
- registerByClassName(context, "org.apache.sling.caconfig.resource.impl.ContextPathStrategyMultiplexer", true);
+ registerByClassName(context, "org.apache.sling.caconfig.resource.impl.ContextPathStrategyMultiplexer");
+ }
+
+ if (!registerByClassName(context, "org.apache.sling.caconfig.resource.impl.ConfigurationResourceResolvingStrategyMultiplexerImpl")) {
+ // fallback to impl 1.2
+ registerByClassName(context, "org.apache.sling.caconfig.resource.impl.ConfigurationResourceResolvingStrategyMultiplexer");
}
- context.registerInjectActivateService(new ConfigurationResourceResolvingStrategyMultiplexer());
context.registerInjectActivateService(new ConfigurationResourceResolverImpl());
}
@@ -105,16 +107,23 @@ public final class ContextPlugins {
if (!registerByClassName(context, "org.apache.sling.caconfig.management.impl.ConfigurationPersistenceStrategyMultiplexerImpl")) {
// fallback to impl 1.2
- registerByClassName(context, "org.apache.sling.caconfig.management.impl.ConfigurationPersistenceStrategyMultiplexer", true);
+ registerByClassName(context, "org.apache.sling.caconfig.management.impl.ConfigurationPersistenceStrategyMultiplexer");
}
- context.registerInjectActivateService(new ConfigurationMetadataProviderMultiplexer());
+ if (!registerByClassName(context, "org.apache.sling.caconfig.impl.metadata.ConfigurationMetadataProviderMultiplexerImpl")) {
+ // fallback to impl 1.2
+ registerByClassName(context, "org.apache.sling.caconfig.impl.metadata.ConfigurationMetadataProviderMultiplexer");
+ }
- // only required for impl 1.2+
- registerByClassName(context, "org.apache.sling.caconfig.impl.ConfigurationInheritanceStrategyMultiplexer");
+ if (!registerByClassName(context, "org.apache.sling.caconfig.impl.ConfigurationInheritanceStrategyMultiplexerImpl")) {
+ // fallback to impl 1.2 (not existing in 1.1 or below)
+ registerByClassName(context, "org.apache.sling.caconfig.impl.ConfigurationInheritanceStrategyMultiplexer");
+ }
- // only required for impl 1.2+
- registerByClassName(context, "org.apache.sling.caconfig.impl.override.ConfigurationOverrideManager");
+ if (!registerByClassName(context, "org.apache.sling.caconfig.impl.override.ConfigurationOverrideMultiplexerImpl")) {
+ // fallback to impl 1.2 (not existing in 1.1 or below)
+ registerByClassName(context, "org.apache.sling.caconfig.impl.override.ConfigurationOverrideManager");
+ }
context.registerInjectActivateService(new ConfigurationResolverImpl());
context.registerInjectActivateService(new ConfigurationBuilderAdapterFactory());
@@ -137,22 +146,13 @@ public final class ContextPlugins {
}
private static boolean registerByClassName(SlingContextImpl context, String className) {
- return registerByClassName(context, className, false);
- }
-
- private static boolean registerByClassName(SlingContextImpl context, String className, boolean mandatory) {
try {
Class<?> clazz = Class.forName(className);
context.registerInjectActivateService(clazz.newInstance());
return true;
}
catch (ClassNotFoundException ex) {
- if (mandatory) {
- throw new RuntimeException(ex.getMessage(), ex);
- }
- else {
- return false;
- }
+ return false;
}
catch (InstantiationException ex) {
throw new RuntimeException(ex);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.