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:16:59 UTC
[sling-org-apache-sling-testing-caconfig-mock-plugin] annotated tag
org.apache.sling.testing.caconfig-mock-plugin-1.1.0 created (now 44ce5ed)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change 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.
at 44ce5ed (tag)
tagging 13279a03b95beeea1c8c8fdeef80e9918d2885a1 (commit)
by Stefan Seifert
on Mon Mar 20 22:41:14 2017 +0000
- Log -----------------------------------------------------------------
org.apache.sling.testing.caconfig-mock-plugin-1.1.0
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new 38ec931 SLING-6360 Context-Aware Config: Sling Mock Context Plugin
new 3b17db3 SLING-6360 suppor registering of configuration annotation classes
new 92df07f SLING-6360 support both impl 1.1 und 1.2
new 4275dd9 update to osgi-mock,sling-mock release versions
new 6e7f2a2 SLING-6360 simplify method signature
new 428d22e SLING-6385 Context-Aware Config: Support default values in ConfigurationResolver for ValueMaps
new b5e9e66 cosmetic: use compatibility code to separate class
new c9d0b76 update to release version
new 497380b update to release version
new fd2df6a update to release version
new 09d0775 fix javadoc errors
new 310e734 [maven-release-plugin] prepare release org.apache.sling.testing.caconfig-mock-plugin-1.0.0
new 1eb04f2 [maven-release-plugin] prepare for next development iteration
new 876ed72 update to next snapshot version until releases are available on maven central
new ef23141 switch to released versions
new 2beb484 SLING-6427 Move Sling Context-Aware Config out of contrib - move in svn - update all SCM URLs - update jenkins build jobs
new 09c97ed use Sling Parent 30
new 6db957c SLING-6670 Support CAConfig Impl 1.3.0
new 4ae02b0 SLING-6670 Support CAConfig Impl 1.3.0
new 2059074 SLING-6670 set dependencies to osgi-mock, sling-mock to "provided" - should be controlled by the main project
new 45cc52b SLING-6670 Support CAConfig Impl 1.3.0
new 1b17353 update dependencies
new ffca8a1 [maven-release-plugin] prepare release org.apache.sling.testing.caconfig-mock-plugin-1.1.0
new 13279a0 [maven-release-plugin] copy for tag org.apache.sling.testing.caconfig-mock-plugin-1.1.0
The 24 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-testing-caconfig-mock-plugin] 02/12: update
to next snapshot version until releases are available on maven central
Posted by ro...@apache.org.
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 876ed7263ae3ce5966e0aaf8b5ad7979130e8f6e
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Dec 13 11:56:37 2016 +0000
update to next snapshot version until releases are available on maven central
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin@1773970 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8a872b6..56959b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,19 +53,19 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.caconfig.api</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.caconfig.spi</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.caconfig.impl</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-caconfig-mock-plugin] 07/12:
SLING-6670 Support CAConfig Impl 1.3.0
Posted by ro...@apache.org.
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>.
[sling-org-apache-sling-testing-caconfig-mock-plugin] 03/12: switch
to released versions
Posted by ro...@apache.org.
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 ef23141e5985f1edaf80340f2e619042777bb024
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Fri Dec 16 15:18:05 2016 +0000
switch to released versions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin@1774619 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 56959b6..8a872b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,19 +53,19 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.caconfig.api</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.caconfig.spi</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.caconfig.impl</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.0</version>
<scope>compile</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-caconfig-mock-plugin] 09/12:
SLING-6670 Support CAConfig Impl 1.3.0
Posted by ro...@apache.org.
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 45cc52b94f0784a7b1d44ed0f77e61e224be7d11
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Mar 20 16:17:06 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@1787807 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java | 3 +++
1 file changed, 3 insertions(+)
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 85f2bb1..0f14346 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
@@ -109,6 +109,9 @@ public final class ContextPlugins {
// fallback to impl 1.2
registerByClassName(context, "org.apache.sling.caconfig.management.impl.ConfigurationPersistenceStrategyMultiplexer");
}
+
+ // only required for impl 1.3+
+ registerByClassName(context, "org.apache.sling.caconfig.impl.ConfigurationPersistenceStrategyBridge");
if (!registerByClassName(context, "org.apache.sling.caconfig.impl.metadata.ConfigurationMetadataProviderMultiplexerImpl")) {
// fallback to impl 1.2
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-caconfig-mock-plugin] 11/12:
[maven-release-plugin] prepare release
org.apache.sling.testing.caconfig-mock-plugin-1.1.0
Posted by ro...@apache.org.
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 ffca8a11a8431e411b08accb86433c3e38b88b7a
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Mar 20 22:41:01 2017 +0000
[maven-release-plugin] prepare release org.apache.sling.testing.caconfig-mock-plugin-1.1.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/caconfig-mock-plugin@1787867 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index a4efcd7..16b1cd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,14 +29,14 @@
<artifactId>org.apache.sling.testing.caconfig-mock-plugin</artifactId>
<packaging>bundle</packaging>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0</version>
<name>Apache Sling Context-Aware Configuration Mock Plugin</name>
<description>Mock Context Plugin for Apache Sling Context-Aware Configuration</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/caconfig-mock-plugin</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/caconfig-mock-plugin</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/testing/mocks/caconfig-mock-plugin</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.caconfig-mock-plugin-1.1.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.caconfig-mock-plugin-1.1.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.caconfig-mock-plugin-1.1.0</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-caconfig-mock-plugin] 08/12:
SLING-6670 set dependencies to osgi-mock,
sling-mock to "provided" - should be controlled by the main project
Posted by ro...@apache.org.
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 20590743d1f30cb28e84984a027deaeb80d0bd18
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Mar 20 12:55:28 2017 +0000
SLING-6670 set dependencies to osgi-mock, sling-mock to "provided" - should be controlled by the main project
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/caconfig-mock-plugin@1787758 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9164f43..4f18ef4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,13 +81,13 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock</artifactId>
<version>2.2.0</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
<version>1.9.0</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-caconfig-mock-plugin] 05/12: use
Sling Parent 30
Posted by ro...@apache.org.
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 09c97edd94c75cbdfa47618ec902b9d597d39903
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Mar 6 10:22:30 2017 +0000
use Sling Parent 30
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/caconfig-mock-plugin@1785621 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 879ff2f..d8ada57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>29</version>
+ <version>30</version>
<relativePath />
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-caconfig-mock-plugin] 04/12:
SLING-6427 Move Sling Context-Aware Config out of contrib - move in svn -
update all SCM URLs - update jenkins build jobs
Posted by ro...@apache.org.
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 2beb484cba00a6f2602acd55d012fef53cc7ea85
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Dec 22 09:52:16 2016 +0000
SLING-6427 Move Sling Context-Aware Config out of contrib
- move in svn
- update all SCM URLs
- update jenkins build jobs
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/caconfig-mock-plugin@1775601 13f79535-47bb-0310-9956-ffa450edef68
---
README.txt | 6 ++++++
pom.xml | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000..1875af9
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,6 @@
+Apache Sling Context-Aware Configuration Mock Plugin
+
+Mock Context Plugin for Apache Sling Context-Aware Configuration
+
+Documentation:
+http://sling.apache.org/documentation/bundles/context-aware-configuration/context-aware-configuration.html
diff --git a/pom.xml b/pom.xml
index 8a872b6..879ff2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,9 +34,9 @@
<description>Mock Context Plugin for Apache Sling Context-Aware Configuration</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/caconfig-mock-plugin</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/caconfig-mock-plugin</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/testing/mocks/caconfig-mock-plugin</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-caconfig-mock-plugin] 10/12: update
dependencies
Posted by ro...@apache.org.
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 1b173539a6c657d791998bef1fe260e6f60cdd82
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Mar 20 22:40:24 2017 +0000
update dependencies
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/caconfig-mock-plugin@1787866 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4f18ef4..a4efcd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,13 +156,13 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.caconfig.spi</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.3.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.caconfig.impl</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.3.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-caconfig-mock-plugin] 06/12:
SLING-6670 Support CAConfig Impl 1.3.0
Posted by ro...@apache.org.
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 6db957c785cb4f49d3a45e65740b8ed068622438
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Sun Mar 19 14:59:51 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@1787628 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 53 ++++++++++++++++++++++
.../testing/mock/caconfig/ContextPlugins.java | 23 ++++++++--
2 files changed, 71 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index d8ada57..9164f43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,18 +53,21 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.caconfig.api</artifactId>
+ <!-- Stick with dependency version 1.1.0 as it was released with caconfig-mock-plugin 1.0.0 -->
<version>1.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.caconfig.spi</artifactId>
+ <!-- Stick with dependency version 1.2.0 as it was released with caconfig-mock-plugin 1.0.0 -->
<version>1.2.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.caconfig.impl</artifactId>
+ <!-- Stick with dependency version 1.2.0 as it was released with caconfig-mock-plugin 1.0.0 -->
<version>1.2.0</version>
<scope>compile</scope>
</dependency>
@@ -115,6 +118,56 @@
</dependencies>
</profile>
+ <!-- Test with Sling CAConfig Impl/SPI 1.2 -->
+ <profile>
+ <id>caconfig-1.2</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.caconfig.api</artifactId>
+ <version>1.1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.caconfig.spi</artifactId>
+ <version>1.2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.caconfig.impl</artifactId>
+ <version>1.2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <!-- Test with Sling CAConfig Impl/SPI 1.3 -->
+ <profile>
+ <id>caconfig-1.3</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.caconfig.api</artifactId>
+ <version>1.1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.caconfig.spi</artifactId>
+ <version>1.2.1-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.caconfig.impl</artifactId>
+ <version>1.2.1-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
</profiles>
</project>
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 dc06a59..6a24e0a 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
@@ -24,7 +24,6 @@ import org.apache.sling.caconfig.impl.def.DefaultConfigurationPersistenceStrateg
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.management.impl.ConfigurationPersistenceStrategyMultiplexer;
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;
@@ -36,7 +35,7 @@ import org.osgi.annotation.versioning.ProviderType;
/**
* Mock context plugins.
- * The plugin supports both 1.0/1.1 and 1.2+ version of the Impl/SPI.
+ * The plugin supports all versions from 1.0 to the most recent versions of the Impl/SPI.
*/
@ProviderType
public final class ContextPlugins {
@@ -82,7 +81,7 @@ 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");
+ registerByClassName(context, "org.apache.sling.caconfig.resource.impl.ContextPathStrategyMultiplexer", true);
}
context.registerInjectActivateService(new ConfigurationResourceResolvingStrategyMultiplexer());
@@ -103,7 +102,12 @@ public final class ContextPlugins {
* @param context Sling context
*/
private static void registerConfigurationResolver(SlingContextImpl context) {
- context.registerInjectActivateService(new ConfigurationPersistenceStrategyMultiplexer());
+
+ 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);
+ }
+
context.registerInjectActivateService(new ConfigurationMetadataProviderMultiplexer());
// only required for impl 1.2+
@@ -133,13 +137,22 @@ 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) {
- return false;
+ if (mandatory) {
+ throw new RuntimeException(ex.getMessage(), ex);
+ }
+ else {
+ 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>.
[sling-org-apache-sling-testing-caconfig-mock-plugin] 01/12:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
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 1eb04f281de6b6403de395554b0ab3e8a9449163
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Dec 13 11:50:36 2016 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin@1773969 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 158796d..8a872b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,14 +29,14 @@
<artifactId>org.apache.sling.testing.caconfig-mock-plugin</artifactId>
<packaging>bundle</packaging>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<name>Apache Sling Context-Aware Configuration Mock Plugin</name>
<description>Mock Context Plugin for Apache Sling Context-Aware Configuration</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.caconfig-mock-plugin-1.0.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.caconfig-mock-plugin-1.0.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.caconfig-mock-plugin-1.0.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-caconfig-mock-plugin] 12/12:
[maven-release-plugin] copy for tag
org.apache.sling.testing.caconfig-mock-plugin-1.1.0
Posted by ro...@apache.org.
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 13279a03b95beeea1c8c8fdeef80e9918d2885a1
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Mar 20 22:41:14 2017 +0000
[maven-release-plugin] copy for tag org.apache.sling.testing.caconfig-mock-plugin-1.1.0
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.caconfig-mock-plugin-1.1.0@1787868 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.