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 09:28:21 UTC
[sling-org-apache-sling-discovery-oak] annotated tag
org.apache.sling.discovery.oak-1.2.10 created (now 9b8b9bb)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git.
at 9b8b9bb (tag)
tagging 173a823f727d4ed0402001c4b7cbb8ffed904b4d (commit)
by Stefan Egli
on Wed Aug 31 15:57:56 2016 +0000
- Log -----------------------------------------------------------------
org.apache.sling.discovery.oak-1.2.10
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new d1c3dce SLING-4603 : added discovery.oak to the project - this is based on discovery.base, which handles topology connectors and contains a few other base classes that were factored out of discovery.impl for exactly this reuse
new f889c65 SLING-4603 : some minor wording change
new c03ca86 SLING-4603 : more aggressively clearing the idMap-cache to avoid stale entries on slingId change - plus added getSyncHistory to BaseSyncTokenConsistencyService to allow adding it to the webconsole for debug - plus some cleanup in webconsole wrt discoveryLite info
new f030cb5 SLING-4603 : introducing configuration for syncToken enabling/disabling - plus using the ConsistencyServiceChain - plus more details when PROPERTIES_CHANGED
new f32fadf SLING-5173 : re-added complete consistency-history after introducing splitting them and using the ConsistencyServiceChain. Probably should be refactored into something slightly nicer though
new e993509 SLING-5188 : similar to moving discovery.impl's topology webconsole, do the same for discovery.oak
new e2707dd SLING-5094 / SLING-5173 / SLING-4603 related : ensure that before invoking the ConsistencyService.sync no async events are still in the queue. This is achieved by enqueueing an async event too that once it gets triggered ensures that no async events are left. This mechanism ensures that before the syncToken is written, all TopologyEventListeners have received a TOPOLOGY_CHANGING - and only that guarantees that the syncToken mechanism carries a high guarantee.
new 38813a3 SLING-5191 / SLING-4603 : rename ConsistencyService to ClusterSyncService - plus making timeout/interval values for the same configurable in discovery.oak
new f845fb8 SLING-4603 : method renamed : handlePotentialTopologyChange, which is slightly confusing anyway, renamed to checkForTopologyChange
new bf3ac64 SLING-4603 : switch to discovery.base/.commons 1.0.0
new d22f2a2 [maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.0.0
new cf00b6e [maven-release-plugin] prepare for next development iteration
new 76cc1ee update discovery dependencies to next snapshot versions until release versions available in maven central
new 680771e SLING-5214: include millis in testing log formats
new ed30aaa SLING-5215 : fixed getTopology to return the correct, previous oldView when the view is undefined, ie not current. This is achieved by making sure OakDiscoveryService sets the oldView whenever the view changes
new 9ef7c5d SLING-5216 / SLING-5195 : more test cases added
new 122527a @no-jira : adjusted discovery.base and .commons dependency to 1.0.2
new 524b1a9 [maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.0.2
new 155b4a1 [maven-release-plugin] prepare for next development iteration
new ba02791 @no-jira : adjusted discovery.base and .commons dependency to 1.0.3-SNAPSHOT
new 917cac3 SLING-5256 : change in localClusterSyncTokenId should always trigger a TOPOLOGY_CHANGED - ensured by adjusting ViewStateManager.onlyDiffersInProperties and DefaultTopologyView.compareTopology accordingly including new tests for both - plus added OakDiscoveryServiceTest.testDescriptorSeqNumChange to verify that discovery.oak now properly detects otherwise-equal topologies when their sequence_number==localClusterSyncTokenId differs (unlikely to happen under normal load sit [...]
new 8cc6d0f SLING-5278 : adding a 2sec safety sleep to avoid failing test on jenkins - plus more logging in case it reoccurs
new 9c09dd4 SLING-5284 : use dedicated PeriodicBackgroundJob-thread instead of scheduler
new 1495890 SLING-5286 : re-activate fast topology change propagation
new 65e191e SLING-5284 : new PeriodicBackgroundJob requires upping of version to 1.1.0
new e660d0b @no-jira using discovery.commons 1.0.4 and discovery.base 1.1.0
new db51f6d [maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.1.0
new 5c615a6 [maven-release-plugin] prepare for next development iteration
new bd43c5c @no-jira using discovery.commons 1.0.5-SNAPSHOT and discovery.base 1.1.1-SNAPSHOT
new 7a100d5 no-jira : fixing a log.info message that did not print out all parameters
new e9ab194 SLING-5328 : add missing documentation
new 5808792 SLING-5326 : adding time-difference health-check 'ClocksInSyncHealthCheck'
new 4615883 SLING-5326 : removing unnecessary import
new c9c8f13 SLING-5326 : adjusted health-check name to be more human readable
new 2b08fde SLING-5326 : renamed ClocksInSyncHC to SynchronizedClocksHC - like that better..
new aae4a2f SLING-5326 : corrected peer slingId for outgoing connectors that is shown in health-check messages
new a6311ab no-jira : switching to discovery.commons 1.0.6 and discovery.base 1.1.2
new 8215919 [maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.2.0
new 17ed775 [maven-release-plugin] prepare for next development iteration
new e69bb8a no-jira : switching to discovery.commons 1.0.7-SNAPSHOT and discovery.base 1.1.3-SNAPSHOT
new afa58bc Remove type from bundle dependencies
new f075830 Switch to parent pom 26
new 7a5c7ee SLING-5458 : support cluster id of discovery lite descriptor to be null - in which case discovery.oak stores and reads a clusterId property to/from /var/discovery/oak
new 7bf9afb SLING-5382 : avoid NPE when PropertyProviders are bind/unbind/changed before activate
new cca6f1e using earlier released version of discovery bundles for discovery.oak 1.2.2 release
new f23ba39 SLING-5458 : requires changes in discovery.commons, so discovery.oak upps the dependency to discovery.commons and both need to be released
new f603f1a SLING-5458 : using in-release version of discovery.commons 1.0.8 for releasing discovery.oak 1.2.2
new 9a29564 [maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.2.2
new b90089c [maven-release-plugin] prepare for next development iteration
new 6c25781 switching to discovery.commons 1.0.9-SNAPSHOT for next development iteration
new 7991282 SLING-5464 : using in-release version of discovery.commons 1.0.10 for releasing discovery.oak 1.2.4
new 6fe6c0e [maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.2.4
new 8f4bf6d [maven-release-plugin] prepare for next development iteration
new a001240 switching to discovery.commons 1.0.11-SNAPSHOT for next development iteration
new 1adb521 SLING-5480 : adjust query to reflect new naming convention used in oak for jmx mbeans
new 5f7836e switching discovery.commons 1.0.10 for now, as thats been released and stable enough at this point
new 4e6ff6c [maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.2.6
new da1c7cb [maven-release-plugin] prepare for next development iteration
new 796c800 SLING-5527 Remove Launchpad API dependency from Discovery Oak
new 0f5eef0 SLING-5600 Fix and update Jackrabbit dependencies
new 0de70f0 SLING-5598 : exclude slow running test by newly introduced Slow junit category - to run them nevertheless use -PincludeSlowTests
new 10aec79 SLING-5697 Missing null check in OakViewChecker for slingHomePath
new fbc30dc use org.apache.sling.commons.testing 2.0.26
new 7ed2d2f use latest stable releases (Jackrabbit and Oak)
new 9f70730 [maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.2.8
new 8c1bead [maven-release-plugin] prepare for next development iteration
new ddaa6c3 SLING-6020 : reduce 'No Descriptor value available' log error down to log warn
new 2a89103 releng : switching to discovery.base 1.1.4 for the discovery.oak 1.2.10 release
new 6756b4c [maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.2.10
new 173a823 [maven-release-plugin] copy for tag org.apache.sling.discovery.oak-1.2.10
The 70 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-discovery-oak] 31/32:
[maven-release-plugin] prepare release
org.apache.sling.discovery.oak-1.2.10
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 6756b4c5528a4412d6ea82e9af0fbe1a45d31ccf
Author: Stefan Egli <st...@apache.org>
AuthorDate: Wed Aug 31 15:57:41 2016 +0000
[maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.2.10
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1758634 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index bd8ebc5..a035a12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.discovery.oak</artifactId>
<packaging>bundle</packaging>
- <version>1.2.9-SNAPSHOT</version>
+ <version>1.2.10</version>
<name>Apache Sling Oak-Based Discovery Service</name>
<description>Implementation of Apache Sling Discovery based on Jackrabbit Oak using its discovery-lite descriptor for in-cluster view detection and a TopologyView through HTTP POST heartbeats announcing sub-topologies to each other.</description>
@@ -42,9 +42,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.10</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.10</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.oak-1.2.10</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-discovery-oak] 28/32:
[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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 8c1bead480d344de40570a47ad705bf1f5d82915
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Jul 14 11:46:39 2016 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1752629 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 51edc09..4b31462 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.discovery.oak</artifactId>
<packaging>bundle</packaging>
- <version>1.2.8</version>
+ <version>1.2.9-SNAPSHOT</version>
<name>Apache Sling Oak-Based Discovery Service</name>
<description>Implementation of Apache Sling Discovery based on Jackrabbit Oak using its discovery-lite descriptor for in-cluster view detection and a TopologyView through HTTP POST heartbeats announcing sub-topologies to each other.</description>
@@ -42,9 +42,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.8</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.8</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.oak-1.2.8</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak</url>
</scm>
<build>
@@ -167,7 +167,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.base</artifactId>
- <version>1.1.4</version>
+ <version>1.1.5-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- besides including discovery.base' normal jar above,
@@ -176,7 +176,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.base</artifactId>
- <version>1.1.4</version>
+ <version>1.1.5-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-oak] 32/32:
[maven-release-plugin] copy for tag org.apache.sling.discovery.oak-1.2.10
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 173a823f727d4ed0402001c4b7cbb8ffed904b4d
Author: Stefan Egli <st...@apache.org>
AuthorDate: Wed Aug 31 15:57:56 2016 +0000
[maven-release-plugin] copy for tag org.apache.sling.discovery.oak-1.2.10
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.10@1758635 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-oak] 20/32:
[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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit da1c7cbb7bf26830fe4db253ce21ba0279d507fd
Author: Stefan Egli <st...@apache.org>
AuthorDate: Wed Feb 3 15:47:51 2016 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1728338 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9d8ed7c..28f6f08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,15 +29,15 @@
<artifactId>org.apache.sling.discovery.oak</artifactId>
<packaging>bundle</packaging>
- <version>1.2.6</version>
+ <version>1.2.7-SNAPSHOT</version>
<name>Apache Sling Oak-Based Discovery Service</name>
<description>Implementation of Apache Sling Discovery based on Jackrabbit Oak using its discovery-lite descriptor for in-cluster view detection and a TopologyView through HTTP POST heartbeats announcing sub-topologies to each other.</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.6</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.6</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.oak-1.2.6</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak</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-discovery-oak] 17/32: SLING-5480 : adjust
query to reflect new naming convention used in oak for jmx mbeans
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 1adb521886641d0bd04878a987a3ea081c1b7c9a
Author: Stefan Egli <st...@apache.org>
AuthorDate: Wed Feb 3 15:06:02 2016 +0000
SLING-5480 : adjust query to reflect new naming convention used in oak for jmx mbeans
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1728328 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/discovery/oak/SynchronizedClocksHealthCheck.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/discovery/oak/SynchronizedClocksHealthCheck.java b/src/main/java/org/apache/sling/discovery/oak/SynchronizedClocksHealthCheck.java
index baf614e..39e8fe8 100644
--- a/src/main/java/org/apache/sling/discovery/oak/SynchronizedClocksHealthCheck.java
+++ b/src/main/java/org/apache/sling/discovery/oak/SynchronizedClocksHealthCheck.java
@@ -64,7 +64,7 @@ public class SynchronizedClocksHealthCheck implements HealthCheck {
protected final Logger logger = LoggerFactory.getLogger(getClass());
- private static final String DOCUMENT_NODE_STORE_MBEAN = "org.apache.jackrabbit.oak:name=*,type=\"DocumentNodeStore\",id=*";
+ private static final String DOCUMENT_NODE_STORE_MBEAN = "org.apache.jackrabbit.oak:name=*,type=DocumentNodeStore";
private static final String TIME_DIFF_METHOD_NAME = "determineServerTimeDifferenceMillis";
private static final long INTRA_CLUSTER_HIGH_WATER_MARK = 5000;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-oak] 07/32: using earlier
released version of discovery bundles for discovery.oak 1.2.2 release
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit cca6f1e8094e4e0a864c30e946706d53e622b375
Author: Stefan Egli <st...@apache.org>
AuthorDate: Wed Jan 27 13:22:12 2016 +0000
using earlier released version of discovery bundles for discovery.oak 1.2.2 release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1727038 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 432376d..fcfd777 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.commons</artifactId>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.6</version>
<scope>provided</scope>
</dependency>
<!-- besides including discovery.commons' normal jar above,
@@ -138,14 +138,14 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.commons</artifactId>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.6</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.base</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.2</version>
<scope>provided</scope>
</dependency>
<!-- besides including discovery.base' normal jar above,
@@ -154,7 +154,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.base</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.2</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-oak] 05/32: SLING-5458 : support
cluster id of discovery lite descriptor to be null - in which case
discovery.oak stores and reads a clusterId property to/from
/var/discovery/oak
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 7a5c7eef972c247dd114a69cb129ae1d6070220a
Author: Stefan Egli <st...@apache.org>
AuthorDate: Wed Jan 27 13:20:04 2016 +0000
SLING-5458 : support cluster id of discovery lite descriptor to be null - in which case discovery.oak stores and reads a clusterId property to/from /var/discovery/oak
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1727035 13f79535-47bb-0310-9956-ffa450edef68
---
.../oak/cluster/OakClusterViewService.java | 82 ++++++++++++++++++++++
1 file changed, 82 insertions(+)
diff --git a/src/main/java/org/apache/sling/discovery/oak/cluster/OakClusterViewService.java b/src/main/java/org/apache/sling/discovery/oak/cluster/OakClusterViewService.java
index 4f770cf..ee082f9 100644
--- a/src/main/java/org/apache/sling/discovery/oak/cluster/OakClusterViewService.java
+++ b/src/main/java/org/apache/sling/discovery/oak/cluster/OakClusterViewService.java
@@ -18,6 +18,7 @@
*/
package org.apache.sling.discovery.oak.cluster;
+import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
@@ -25,11 +26,14 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.resource.LoginException;
+import org.apache.sling.api.resource.ModifiableValueMap;
+import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
@@ -42,6 +46,7 @@ import org.apache.sling.discovery.commons.providers.DefaultInstanceDescription;
import org.apache.sling.discovery.commons.providers.spi.LocalClusterView;
import org.apache.sling.discovery.commons.providers.spi.base.DiscoveryLiteDescriptor;
import org.apache.sling.discovery.commons.providers.spi.base.IdMapService;
+import org.apache.sling.discovery.commons.providers.util.ResourceHelper;
import org.apache.sling.discovery.oak.Config;
import org.apache.sling.settings.SlingSettingsService;
import org.slf4j.Logger;
@@ -54,6 +59,10 @@ import org.slf4j.LoggerFactory;
@Service(value = ClusterViewService.class)
public class OakClusterViewService implements ClusterViewService {
+ private static final String PROPERTY_CLUSTER_ID = "clusterId";
+ private static final String PROPERTY_CLUSTER_ID_DEFINED_AT = "clusterIdDefinedAt";
+ private static final String PROPERTY_CLUSTER_ID_DEFINED_BY = "clusterIdDefinedBy";
+
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Reference
@@ -130,6 +139,10 @@ public class OakClusterViewService implements ClusterViewService {
}
logger.trace("asClusterView: start");
String clusterViewId = descriptor.getViewId();
+ if (clusterViewId == null || clusterViewId.length() == 0) {
+ logger.trace("asClusterView: no clusterId provided by discovery-lite descriptor - reading from repo.");
+ clusterViewId = readOrDefineClusterId(resourceResolver);
+ }
String localClusterSyncTokenId = /*descriptor.getViewId()+"_"+*/String.valueOf(descriptor.getSeqNum());
if (!descriptor.isFinal()) {
throw new UndefinedClusterViewException(Reason.NO_ESTABLISHED_VIEW, "descriptor is not yet final: "+descriptor);
@@ -200,6 +213,75 @@ public class OakClusterViewService implements ClusterViewService {
}
}
+ /**
+ * oak's discovery-lite can opt to not provide a clusterViewId eg in the
+ * single-VM case. (for clusters discovery-lite normally defines the
+ * clusterViewId, as it is the one responsible for defining the membership
+ * too) Thus if we're not getting an id here we have to define one here. (we
+ * can typically assume that this corresponds to a singleVM case, but that's
+ * not a 100% requirement). This id must be stored to ensure the contract
+ * that the clusterId is stable across restarts. For that, the id is stored
+ * under /var/discovery/oak (and to account for odd/edgy cases we'll do a
+ * retry when storing the id, in case we'd run into conflicts, even though
+ * they should not occur in singleVM cases)
+ *
+ * @param resourceResolver the ResourceResolver with which to read or write
+ * the clusterId properties under /var/discovery/oak
+ * @return the clusterId to be used - either the one read or defined
+ * at /var/discovery/oak - or the slingId in case of non-fixable exceptions
+ * @throws PersistenceException when /var/discovery/oak could not be
+ * accessed or auto-created
+ */
+ private String readOrDefineClusterId(ResourceResolver resourceResolver) throws PersistenceException {
+ //TODO: if Config gets a specific, public getDiscoveryResourcePath, this can be simplified:
+ final String clusterInstancesPath = config.getClusterInstancesPath();
+ final String discoveryResourcePath = clusterInstancesPath.substring(0,
+ clusterInstancesPath.lastIndexOf("/", clusterInstancesPath.length()-2));
+ final int MAX_RETRIES = 5;
+ for(int retryCnt=0; retryCnt<MAX_RETRIES; retryCnt++) {
+ Resource varDiscoveryOak = resourceResolver.getResource(discoveryResourcePath);
+ if (varDiscoveryOak == null) {
+ varDiscoveryOak = ResourceHelper.getOrCreateResource(resourceResolver, discoveryResourcePath);
+ }
+ if (varDiscoveryOak == null) {
+ logger.error("readOrDefinedClusterId: Could not create: "+discoveryResourcePath);
+ throw new RuntimeException("could not create " + discoveryResourcePath);
+ }
+ ModifiableValueMap props = varDiscoveryOak.adaptTo(ModifiableValueMap.class);
+ if (props == null) {
+ logger.error("readOrDefineClusterId: Could not adaptTo ModifiableValueMap: "+varDiscoveryOak);
+ throw new RuntimeException("could not adaptTo ModifiableValueMap: " + varDiscoveryOak);
+ }
+ Object clusterIdObj = props.get(PROPERTY_CLUSTER_ID);
+ String clusterId = (clusterIdObj == null) ? null : String.valueOf(clusterIdObj);
+ if (clusterId != null && clusterId.length() > 0) {
+ logger.trace("readOrDefineClusterId: read clusterId from repo as {}", clusterId);
+ return clusterId;
+ }
+
+ // must now define a new clusterId and store it under /var/discovery/oak
+ final String newClusterId = UUID.randomUUID().toString();
+ props.put(PROPERTY_CLUSTER_ID, newClusterId);
+ props.put(PROPERTY_CLUSTER_ID_DEFINED_BY, getSlingId());
+ props.put(PROPERTY_CLUSTER_ID_DEFINED_AT, Calendar.getInstance());
+ try {
+ logger.info("readOrDefineClusterId: storing new clusterId as " + newClusterId);
+ resourceResolver.commit();
+ return newClusterId;
+ } catch (PersistenceException e) {
+ logger.warn("readOrDefineClusterId: could not persist clusterId "
+ + "(retrying in 1 sec max " + (MAX_RETRIES - retryCnt - 1) + " more times: " + e, e);
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e1) {
+ logger.warn("readOrDefineClusterId: got interrupted: "+e1, e1);
+ }
+ logger.info("readOrDefineClusterId: retrying now.");
+ }
+ }
+ throw new RuntimeException("failed to write new clusterId (see log file earlier for more details)");
+ }
+
private String getLeaderElectionId(ResourceResolver resourceResolver, String slingId) {
if (slingId==null) {
throw new IllegalStateException("slingId must not be null");
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-oak] 14/32:
[maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.2.4
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 6fe6c0e7d2f3e1920031109f5132656e59bc35ac
Author: Stefan Egli <st...@apache.org>
AuthorDate: Thu Jan 28 13:19:07 2016 +0000
[maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.2.4
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1727335 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 38077a3..6d63ce0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,15 +29,15 @@
<artifactId>org.apache.sling.discovery.oak</artifactId>
<packaging>bundle</packaging>
- <version>1.2.3-SNAPSHOT</version>
+ <version>1.2.4</version>
<name>Apache Sling Oak-Based Discovery Service</name>
<description>Implementation of Apache Sling Discovery based on Jackrabbit Oak using its discovery-lite descriptor for in-cluster view detection and a TopologyView through HTTP POST heartbeats announcing sub-topologies to each other.</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.4</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.4</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.oak-1.2.4</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-discovery-oak] 24/32: SLING-5697 Missing
null check in OakViewChecker for slingHomePath
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 10aec7962dddbb0debc3923af658193617f1756f
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Apr 28 20:20:23 2016 +0000
SLING-5697 Missing null check in OakViewChecker for slingHomePath
add null-check for slingSettingsService.getSlingHomePath()
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1741508 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java b/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java
index 3ba00bd..4dd9e22 100644
--- a/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java
+++ b/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java
@@ -257,7 +257,10 @@ public class OakViewChecker extends BaseViewChecker {
resourceMap.put(PROPERTY_ID_RUNTIME, runtimeId);
// SLING-4765 : store more infos to be able to be more verbose on duplicate slingId/ghost detection
- final String slingHomePath = slingSettingsService==null ? "n/a" : slingSettingsService.getSlingHomePath();
+ String slingHomePath = "n/a";
+ if (slingSettingsService != null && slingSettingsService.getSlingHomePath() != null) {
+ slingHomePath = slingSettingsService.getSlingHomePath();
+ }
resourceMap.put(PROPERTY_ID_SLING_HOME_PATH, slingHomePath);
final String endpointsAsString = getEndpointsAsString();
resourceMap.put(PROPERTY_ID_ENDPOINTS, endpointsAsString);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-oak] 03/32: Remove type from
bundle 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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit afa58bc72477832944d3b0265369b3d7ce781461
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Dec 21 11:05:09 2015 +0000
Remove type from bundle dependencies
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1721125 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9ea34a7..b656bb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -279,7 +279,6 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.threads</artifactId>
<version>3.1.0</version>
- <type>bundle</type>
<scope>test</scope>
</dependency>
<dependency>
@@ -297,14 +296,12 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
<version>2.11.0</version>
- <type>bundle</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-api</artifactId>
<version>2.11.0</version>
- <type>bundle</type>
<scope>test</scope>
</dependency>
<dependency>
@@ -323,7 +320,6 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.hc.core</artifactId>
<version>1.0.6</version>
- <type>bundle</type>
</dependency>
</dependencies>
</project>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-oak] 22/32: SLING-5600 Fix and
update Jackrabbit 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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 0f5eef070554de39ca9fed4ac90cae2e2e92ceae
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Mar 11 19:36:06 2016 +0000
SLING-5600 Fix and update Jackrabbit dependencies
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1734619 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 448de88..a284198 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,10 @@
<name>Apache Sling Oak-Based Discovery Service</name>
<description>Implementation of Apache Sling Discovery based on Jackrabbit Oak using its discovery-lite descriptor for in-cluster view detection and a TopologyView through HTTP POST heartbeats announcing sub-topologies to each other.</description>
+ <properties>
+ <jackrabbit.version>2.12.1</jackrabbit.version>
+ </properties>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</developerConnection>
@@ -108,7 +112,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-api</artifactId>
- <version>2.2.4</version>
+ <version>${jackrabbit.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -292,13 +296,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
- <version>2.11.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-api</artifactId>
- <version>2.11.0</version>
+ <version>${jackrabbit.version}</version>
<scope>test</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-discovery-oak] 02/32: no-jira : switching
to discovery.commons 1.0.7-SNAPSHOT and discovery.base 1.1.3-SNAPSHOT
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit e69bb8a902d053471a428e597de325b25706bc2b
Author: Stefan Egli <st...@apache.org>
AuthorDate: Wed Nov 25 14:02:37 2015 +0000
no-jira : switching to discovery.commons 1.0.7-SNAPSHOT and discovery.base 1.1.3-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1716416 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4c013ab..9ea34a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.commons</artifactId>
- <version>1.0.6</version>
+ <version>1.0.7-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- besides including discovery.commons' normal jar above,
@@ -138,14 +138,14 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.commons</artifactId>
- <version>1.0.6</version>
+ <version>1.0.7-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.base</artifactId>
- <version>1.1.2</version>
+ <version>1.1.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- besides including discovery.base' normal jar above,
@@ -154,7 +154,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.base</artifactId>
- <version>1.1.2</version>
+ <version>1.1.3-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-oak] 13/32: SLING-5464 : using
in-release version of discovery.commons 1.0.10 for releasing discovery.oak
1.2.4
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 79912824a0ce72d62c8d05fddfabb1a346c58526
Author: Stefan Egli <st...@apache.org>
AuthorDate: Thu Jan 28 12:58:21 2016 +0000
SLING-5464 : using in-release version of discovery.commons 1.0.10 for releasing discovery.oak 1.2.4
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1727332 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 52c904f..38077a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.commons</artifactId>
- <version>1.0.9-SNAPSHOT</version>
+ <version>1.0.10</version>
<scope>provided</scope>
</dependency>
<!-- besides including discovery.commons' normal jar above,
@@ -138,7 +138,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.commons</artifactId>
- <version>1.0.9-SNAPSHOT</version>
+ <version>1.0.10</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-oak] 09/32: SLING-5458 : using
in-release version of discovery.commons 1.0.8 for releasing discovery.oak
1.2.2
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit f603f1a28d79554d1be86f67fc01ff3e1e782433
Author: Stefan Egli <st...@apache.org>
AuthorDate: Wed Jan 27 15:52:49 2016 +0000
SLING-5458 : using in-release version of discovery.commons 1.0.8 for releasing discovery.oak 1.2.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1727099 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 38bc7bc..994c79f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.commons</artifactId>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.8</version>
<scope>provided</scope>
</dependency>
<!-- besides including discovery.commons' normal jar above,
@@ -138,7 +138,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.commons</artifactId>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.8</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-oak] 10/32:
[maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.2.2
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 9a29564199265903ebfc8f4f5b27cf5d9cc8360f
Author: Stefan Egli <st...@apache.org>
AuthorDate: Wed Jan 27 16:06:00 2016 +0000
[maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.2.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1727107 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 994c79f..8e7c956 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,15 +29,15 @@
<artifactId>org.apache.sling.discovery.oak</artifactId>
<packaging>bundle</packaging>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.2</version>
<name>Apache Sling Oak-Based Discovery Service</name>
<description>Implementation of Apache Sling Discovery based on Jackrabbit Oak using its discovery-lite descriptor for in-cluster view detection and a TopologyView through HTTP POST heartbeats announcing sub-topologies to each other.</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.oak-1.2.2</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-discovery-oak] 16/32: switching to
discovery.commons 1.0.11-SNAPSHOT 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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit a00124075a58e932f899f53c0922189e84540985
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Jan 28 20:58:21 2016 +0000
switching to discovery.commons 1.0.11-SNAPSHOT for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1727438 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index fc1e156..1c59b66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.commons</artifactId>
- <version>1.0.10</version>
+ <version>1.0.11-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- besides including discovery.commons' normal jar above,
@@ -138,7 +138,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.commons</artifactId>
- <version>1.0.10</version>
+ <version>1.0.11-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-oak] 04/32: Switch to parent pom
26
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit f0758305752beb6c3761494f920519babb8ee787
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Jan 3 14:07:46 2016 +0000
Switch to parent pom 26
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1722720 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b656bb3..432376d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>25</version>
+ <version>26</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-discovery-oak] 19/32:
[maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.2.6
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 4e6ff6cd4530de71f0527d1fe288609d94dadd58
Author: Stefan Egli <st...@apache.org>
AuthorDate: Wed Feb 3 15:47:32 2016 +0000
[maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.2.6
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1728336 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index fc1e156..9d8ed7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,15 +29,15 @@
<artifactId>org.apache.sling.discovery.oak</artifactId>
<packaging>bundle</packaging>
- <version>1.2.5-SNAPSHOT</version>
+ <version>1.2.6</version>
<name>Apache Sling Oak-Based Discovery Service</name>
<description>Implementation of Apache Sling Discovery based on Jackrabbit Oak using its discovery-lite descriptor for in-cluster view detection and a TopologyView through HTTP POST heartbeats announcing sub-topologies to each other.</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.6</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.6</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.oak-1.2.6</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-discovery-oak] 21/32: SLING-5527 Remove
Launchpad API dependency from Discovery Oak
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 796c8003d4db96fa745d318a7a3819c12d0e611d
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Feb 17 17:15:52 2016 +0000
SLING-5527 Remove Launchpad API dependency from Discovery Oak
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1730879 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 13 +++++--------
.../sling/discovery/oak/pinger/OakViewChecker.java | 17 +----------------
2 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index 28f6f08..448de88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,9 @@
<Embed-Dependency>
commons-net;inline=org/apache/commons/net/util/SubnetUtils*
</Embed-Dependency>
+ <Export-Package>
+ !org.apache.sling.discovery.oak
+ </Export-Package>
</instructions>
</configuration>
</plugin>
@@ -145,7 +148,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.base</artifactId>
- <version>1.1.2</version>
+ <version>1.1.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- besides including discovery.base' normal jar above,
@@ -154,7 +157,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.base</artifactId>
- <version>1.1.2</version>
+ <version>1.1.3-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -199,12 +202,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad.api</artifactId>
- <version>1.1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
diff --git a/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java b/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java
index b0ed843..3ba00bd 100644
--- a/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java
+++ b/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java
@@ -41,8 +41,6 @@ import org.apache.sling.discovery.base.connectors.ping.ConnectorRegistry;
import org.apache.sling.discovery.commons.providers.util.ResourceHelper;
import org.apache.sling.discovery.oak.Config;
import org.apache.sling.discovery.oak.OakDiscoveryService;
-import org.apache.sling.launchpad.api.StartupListener;
-import org.apache.sling.launchpad.api.StartupMode;
import org.apache.sling.settings.SlingSettingsService;
import org.osgi.service.http.HttpService;
@@ -57,7 +55,7 @@ import org.osgi.service.http.HttpService;
* discovery.base
*/
@Component
-@Service(value = { OakViewChecker.class, StartupListener.class })
+@Service(value = OakViewChecker.class)
@Reference(referenceInterface=HttpService.class,
cardinality=ReferenceCardinality.OPTIONAL_MULTIPLE,
policy=ReferencePolicy.DYNAMIC)
@@ -156,19 +154,6 @@ public class OakViewChecker extends BaseViewChecker {
}
}
- @Override
- public void startupFinished(StartupMode mode) {
- super.startupFinished(mode);
-
- synchronized(lock) {
- if (activated) {
- // only reset if activated
- resetLeaderElectionId();
- }
- }
-
- }
-
/**
* The initialize method is called by the OakDiscoveryService.activate
* as we require the discoveryService (and the discoveryService has
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-oak] 25/32: use
org.apache.sling.commons.testing 2.0.26
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit fbc30dc8672bb88467f4443eb77fbf4dab54aec1
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Jul 13 13:36:01 2016 +0000
use org.apache.sling.commons.testing 2.0.26
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1752429 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3ccf522..95330d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -256,7 +256,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.testing</artifactId>
- <version>2.0.25-SNAPSHOT</version>
+ <version>2.0.26</version>
<scope>test</scope>
<exclusions>
<!-- slf4j simple implementation logs INFO + higher to stdout (we don't want that behaviour) -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-oak] 30/32: releng : switching to
discovery.base 1.1.4 for the discovery.oak 1.2.10 release
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 2a89103772be49b0303e6a6052f8e415ae63248d
Author: Stefan Egli <st...@apache.org>
AuthorDate: Wed Aug 31 15:48:51 2016 +0000
releng : switching to discovery.base 1.1.4 for the discovery.oak 1.2.10 release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1758631 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4b31462..bd8ebc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,7 +167,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.base</artifactId>
- <version>1.1.5-SNAPSHOT</version>
+ <version>1.1.4</version>
<scope>provided</scope>
</dependency>
<!-- besides including discovery.base' normal jar above,
@@ -176,7 +176,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.base</artifactId>
- <version>1.1.5-SNAPSHOT</version>
+ <version>1.1.4</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-oak] 23/32: SLING-5598 : exclude
slow running test by newly introduced Slow junit category - to run them
nevertheless use -PincludeSlowTests
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 0de70f0ada8a8338c8421194b504afda5c51eb58
Author: Stefan Egli <st...@apache.org>
AuthorDate: Wed Apr 27 09:25:49 2016 +0000
SLING-5598 : exclude slow running test by newly introduced Slow junit category - to run them nevertheless use -PincludeSlowTests
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1741177 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index a284198..3ccf522 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,9 @@
<properties>
<jackrabbit.version>2.12.1</jackrabbit.version>
+
+ <!-- by default Slow tests are excluded - use -PincludeSlowTests to include them -->
+ <sling.excluded.surefire.groups>org.apache.sling.commons.testing.junit.categories.Slow</sling.excluded.surefire.groups>
</properties>
<scm>
@@ -49,10 +52,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <redirectTestOutputToFile>false</redirectTestOutputToFile>
- <argLine>-Xmx2048m</argLine>
- </configuration>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <argLine>-Xmx2048m</argLine>
+ <excludedGroups>${sling.excluded.surefire.groups}</excludedGroups>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -75,6 +79,17 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <!-- when -PincludeSlowTests is set, the Slow tests should also be executed,
+ hence unsetting the category excludes 'sling.excluded.surefire.groups' to
+ achieve that. -->
+ <id>includeSlowTests</id>
+ <properties>
+ <sling.excluded.surefire.groups></sling.excluded.surefire.groups>
+ </properties>
+ </profile>
+ </profiles>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -241,7 +256,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.testing</artifactId>
- <version>2.0.16</version>
+ <version>2.0.25-SNAPSHOT</version>
<scope>test</scope>
<exclusions>
<!-- slf4j simple implementation logs INFO + higher to stdout (we don't want that behaviour) -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-oak] 15/32:
[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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 8f4bf6d0f558c5ef5b3c31f5ea838c908a847b65
Author: Stefan Egli <st...@apache.org>
AuthorDate: Thu Jan 28 13:19:26 2016 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1727338 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6d63ce0..fc1e156 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,15 +29,15 @@
<artifactId>org.apache.sling.discovery.oak</artifactId>
<packaging>bundle</packaging>
- <version>1.2.4</version>
+ <version>1.2.5-SNAPSHOT</version>
<name>Apache Sling Oak-Based Discovery Service</name>
<description>Implementation of Apache Sling Discovery based on Jackrabbit Oak using its discovery-lite descriptor for in-cluster view detection and a TopologyView through HTTP POST heartbeats announcing sub-topologies to each other.</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.4</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.4</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.oak-1.2.4</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak</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-discovery-oak] 08/32: SLING-5458 : requires
changes in discovery.commons,
so discovery.oak upps the dependency to discovery.commons and both need to
be released
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit f23ba397657adade4cc3b3e203b454ce363b6dd4
Author: Stefan Egli <st...@apache.org>
AuthorDate: Wed Jan 27 15:18:50 2016 +0000
SLING-5458 : requires changes in discovery.commons, so discovery.oak upps the dependency to discovery.commons and both need to be released
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1727086 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index fcfd777..38bc7bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.commons</artifactId>
- <version>1.0.6</version>
+ <version>1.0.7-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- besides including discovery.commons' normal jar above,
@@ -138,7 +138,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.commons</artifactId>
- <version>1.0.6</version>
+ <version>1.0.7-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-oak] 26/32: use latest stable
releases (Jackrabbit and Oak)
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 7ed2d2fc06d0f67a05b78aa448c746415f37bfda
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Jul 13 13:44:32 2016 +0000
use latest stable releases (Jackrabbit and Oak)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1752431 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 95330d7..7f4b29f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,8 +35,8 @@
<description>Implementation of Apache Sling Discovery based on Jackrabbit Oak using its discovery-lite descriptor for in-cluster view detection and a TopologyView through HTTP POST heartbeats announcing sub-topologies to each other.</description>
<properties>
- <jackrabbit.version>2.12.1</jackrabbit.version>
-
+ <jackrabbit.version>2.12.2</jackrabbit.version>
+ <oak.version>1.4.4</oak.version>
<!-- by default Slow tests are excluded - use -PincludeSlowTests to include them -->
<sling.excluded.surefire.groups>org.apache.sling.commons.testing.junit.categories.Slow</sling.excluded.surefire.groups>
</properties>
@@ -317,13 +317,13 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-core</artifactId>
- <version>1.3.7</version>
+ <version>${oak.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-jcr</artifactId>
- <version>1.3.7</version>
+ <version>${oak.version}</version>
<scope>test</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-discovery-oak] 18/32: switching
discovery.commons 1.0.10 for now,
as thats been released and stable enough at this point
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 5f7836ee8741c0b6e273a97d09e6a8034878cd11
Author: Stefan Egli <st...@apache.org>
AuthorDate: Wed Feb 3 15:34:03 2016 +0000
switching discovery.commons 1.0.10 for now, as thats been released and stable enough at this point
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1728332 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1c59b66..fc1e156 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.commons</artifactId>
- <version>1.0.11-SNAPSHOT</version>
+ <version>1.0.10</version>
<scope>provided</scope>
</dependency>
<!-- besides including discovery.commons' normal jar above,
@@ -138,7 +138,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.commons</artifactId>
- <version>1.0.11-SNAPSHOT</version>
+ <version>1.0.10</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-oak] 01/32:
[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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 17ed77573aa578cb013366de0706bf1b0887a849
Author: Stefan Egli <st...@apache.org>
AuthorDate: Wed Nov 25 13:47:00 2015 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1716409 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 155de98..4c013ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,15 +29,15 @@
<artifactId>org.apache.sling.discovery.oak</artifactId>
<packaging>bundle</packaging>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<name>Apache Sling Oak-Based Discovery Service</name>
<description>Implementation of Apache Sling Discovery based on Jackrabbit Oak using its discovery-lite descriptor for in-cluster view detection and a TopologyView through HTTP POST heartbeats announcing sub-topologies to each other.</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.oak-1.2.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak</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-discovery-oak] 11/32:
[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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit b90089c72ed23c75f03957d8c06f065138dfd31b
Author: Stefan Egli <st...@apache.org>
AuthorDate: Wed Jan 27 16:06:21 2016 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1727109 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8e7c956..35c2b9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,15 +29,15 @@
<artifactId>org.apache.sling.discovery.oak</artifactId>
<packaging>bundle</packaging>
- <version>1.2.2</version>
+ <version>1.2.3-SNAPSHOT</version>
<name>Apache Sling Oak-Based Discovery Service</name>
<description>Implementation of Apache Sling Discovery based on Jackrabbit Oak using its discovery-lite descriptor for in-cluster view detection and a TopologyView through HTTP POST heartbeats announcing sub-topologies to each other.</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.2</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.2</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.oak-1.2.2</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak</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-discovery-oak] 12/32: switching to
discovery.commons 1.0.9-SNAPSHOT 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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 6c257818b9c609577f4ae4c2b3d38dc186930624
Author: Stefan Egli <st...@apache.org>
AuthorDate: Wed Jan 27 16:23:59 2016 +0000
switching to discovery.commons 1.0.9-SNAPSHOT for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1727114 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 35c2b9b..52c904f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.commons</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- besides including discovery.commons' normal jar above,
@@ -138,7 +138,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.commons</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-oak] 06/32: SLING-5382 : avoid
NPE when PropertyProviders are bind/unbind/changed before activate
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 7bf9afb0128eb9ad439c02ae3a3d93bec427e3cf
Author: Stefan Egli <st...@apache.org>
AuthorDate: Wed Jan 27 13:21:26 2016 +0000
SLING-5382 : avoid NPE when PropertyProviders are bind/unbind/changed before activate
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1727036 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/discovery/oak/OakDiscoveryService.java | 38 ++++++++++++++++------
1 file changed, 28 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/apache/sling/discovery/oak/OakDiscoveryService.java b/src/main/java/org/apache/sling/discovery/oak/OakDiscoveryService.java
index 2beab3b..bdbbd97 100644
--- a/src/main/java/org/apache/sling/discovery/oak/OakDiscoveryService.java
+++ b/src/main/java/org/apache/sling/discovery/oak/OakDiscoveryService.java
@@ -107,7 +107,7 @@ public class OakDiscoveryService extends BaseDiscoveryService {
* whether or not this service is activated - necessary to avoid sending
* events to discovery awares before activate is done
**/
- private boolean activated = false;
+ private volatile boolean activated = false;
@Reference
private ResourceResolverFactory resourceResolverFactory;
@@ -400,7 +400,9 @@ public class OakDiscoveryService extends BaseDiscoveryService {
final ProviderInfo info = new ProviderInfo(propertyProvider, props);
this.providerInfos.add(info);
Collections.sort(this.providerInfos);
- this.doUpdateProperties();
+ if (activated) {
+ this.doUpdateProperties();
+ }
checkForTopologyChange();
}
@@ -439,7 +441,9 @@ public class OakDiscoveryService extends BaseDiscoveryService {
final ProviderInfo info = new ProviderInfo(propertyProvider, props);
if ( this.providerInfos.remove(info) && update ) {
- this.doUpdateProperties();
+ if (activated) {
+ this.doUpdateProperties();
+ }
this.checkForTopologyChange();
}
}
@@ -454,9 +458,19 @@ public class OakDiscoveryService extends BaseDiscoveryService {
* @see Config#getClusterInstancesPath()
*/
private void doUpdateProperties() {
- if (resourceResolverFactory == null) {
+ // SLING-5382 : the caller must ensure that this method
+ // is not invoked after deactivation or before activation.
+ // so this method doesn't have to do any further synchronization.
+ // what we do nevertheless is a paranoia way of checking if
+ // all variables are available and do a NOOP if that's not the case.
+ final ResourceResolverFactory rrf = resourceResolverFactory;
+ final Config c = config;
+ final String sid = slingId;
+ if (rrf == null || c == null || sid == null) {
// cannot update the properties then..
- logger.debug("doUpdateProperties: too early to update the properties. resourceResolverFactory not yet set.");
+ logger.debug("doUpdateProperties: too early to update the properties. "
+ + "resourceResolverFactory ({}), config ({}) or slingId ({}) not yet set.",
+ new Object[] {rrf, c, sid});
return;
} else {
logger.debug("doUpdateProperties: updating properties now..");
@@ -470,14 +484,14 @@ public class OakDiscoveryService extends BaseDiscoveryService {
ResourceResolver resourceResolver = null;
try {
- resourceResolver = resourceResolverFactory
+ resourceResolver = rrf
.getAdministrativeResourceResolver(null);
Resource myInstance = ResourceHelper
.getOrCreateResource(
resourceResolver,
- config.getClusterInstancesPath()
- + "/" + slingId + "/properties");
+ c.getClusterInstancesPath()
+ + "/" + sid + "/properties");
// SLING-2879 - revert/refresh resourceResolver here to work
// around a potential issue with jackrabbit in a clustered environment
resourceResolver.revert();
@@ -541,8 +555,12 @@ public class OakDiscoveryService extends BaseDiscoveryService {
*/
public void updateProperties() {
synchronized (lock) {
- logger.debug("updateProperties: calling doUpdateProperties.");
- doUpdateProperties();
+ if (!activated) {
+ logger.debug("updateProperties: not yet activated, not calling doUpdateProperties this time.");
+ } else {
+ logger.debug("updateProperties: calling doUpdateProperties.");
+ doUpdateProperties();
+ }
logger.debug("updateProperties: calling handlePotentialTopologyChange.");
checkForTopologyChange();
logger.debug("updateProperties: done.");
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-oak] 27/32:
[maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.2.8
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 9f7073099c2b6a02adf36d37cf76396cffb47d37
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Jul 14 11:46:24 2016 +0000
[maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.2.8
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1752627 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7f4b29f..51edc09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.discovery.oak</artifactId>
<packaging>bundle</packaging>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.8</version>
<name>Apache Sling Oak-Based Discovery Service</name>
<description>Implementation of Apache Sling Discovery based on Jackrabbit Oak using its discovery-lite descriptor for in-cluster view detection and a TopologyView through HTTP POST heartbeats announcing sub-topologies to each other.</description>
@@ -42,9 +42,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.8</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.2.8</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.oak-1.2.8</url>
</scm>
<build>
@@ -86,7 +86,7 @@
achieve that. -->
<id>includeSlowTests</id>
<properties>
- <sling.excluded.surefire.groups></sling.excluded.surefire.groups>
+ <sling.excluded.surefire.groups />
</properties>
</profile>
</profiles>
@@ -167,7 +167,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.base</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4</version>
<scope>provided</scope>
</dependency>
<!-- besides including discovery.base' normal jar above,
@@ -176,7 +176,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.base</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-discovery-oak] 29/32: SLING-6020 : reduce
'No Descriptor value available' log error down to log warn
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.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit ddaa6c32d0b03e17c47a2a6ada8270c04118b43e
Author: Stefan Egli <st...@apache.org>
AuthorDate: Wed Aug 31 15:45:54 2016 +0000
SLING-6020 : reduce 'No Descriptor value available' log error down to log warn
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1758629 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/discovery/oak/cluster/OakClusterViewService.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/discovery/oak/cluster/OakClusterViewService.java b/src/main/java/org/apache/sling/discovery/oak/cluster/OakClusterViewService.java
index ee082f9..340518e 100644
--- a/src/main/java/org/apache/sling/discovery/oak/cluster/OakClusterViewService.java
+++ b/src/main/java/org/apache/sling/discovery/oak/cluster/OakClusterViewService.java
@@ -120,7 +120,11 @@ public class OakClusterViewService implements ClusterViewService {
logger.info("getLocalClusterView: undefined clusterView: "+e.getReason()+" - "+e.getMessage());
throw e;
} catch (Exception e) {
- logger.error("getLocalClusterView: repository exception: "+e, e);
+ if (e.getMessage() != null && e.getMessage().contains("No Descriptor value available")) {
+ logger.warn("getLocalClusterView: repository exception: "+e);
+ } else {
+ logger.error("getLocalClusterView: repository exception: "+e, e);
+ }
throw new UndefinedClusterViewException(Reason.REPOSITORY_EXCEPTION, "Exception while processing descriptor: "+e);
} finally {
logger.trace("getLocalClusterView: end");
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.