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:27:48 UTC
[sling-org-apache-sling-discovery-oak] annotated tag
org.apache.sling.discovery.oak-1.0.2 created (now 06cbf0f)
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.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git.
at 06cbf0f (tag)
tagging 678ef3c6c1410865526cfc301f6be3a77983d66a (commit)
by Stefan Egli
on Mon Nov 2 16:13:29 2015 +0000
- Log -----------------------------------------------------------------
org.apache.sling.discovery.oak-1.0.2
-----------------------------------------------------------------------
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 678ef3c [maven-release-plugin] copy for tag org.apache.sling.discovery.oak-1.0.2
The 19 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] 02/08: update discovery
dependencies to next snapshot versions until release versions available in
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.discovery.oak-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 76cc1eebb71118545fa1d06ad9ab1ebd1d69e1ee
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Oct 26 22:05:15 2015 +0000
update discovery dependencies to next snapshot versions until release versions available in maven central
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1710708 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6a795db..d7bf8ae 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.0</version>
+ <version>1.0.1-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.0</version>
+ <version>1.0.1-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.0.0</version>
+ <version>1.0.1-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.0.0</version>
+ <version>1.0.1-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] 05/08: SLING-5216 /
SLING-5195 : more test cases added
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.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 9ef7c5db203043010ced052ec664677a0bb53690
Author: Stefan Egli <st...@apache.org>
AuthorDate: Thu Oct 29 19:03:04 2015 +0000
SLING-5216 / SLING-5195 : more test cases added
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1711331 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/discovery/oak/its/OakDiscoveryServiceTest.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/test/java/org/apache/sling/discovery/oak/its/OakDiscoveryServiceTest.java b/src/test/java/org/apache/sling/discovery/oak/its/OakDiscoveryServiceTest.java
index 65f63a3..0f4bc7e 100644
--- a/src/test/java/org/apache/sling/discovery/oak/its/OakDiscoveryServiceTest.java
+++ b/src/test/java/org/apache/sling/discovery/oak/its/OakDiscoveryServiceTest.java
@@ -26,6 +26,7 @@ import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
import org.apache.sling.discovery.TopologyEvent.Type;
import org.apache.sling.discovery.TopologyView;
+import org.apache.sling.discovery.base.its.AbstractDiscoveryServiceTest;
import org.apache.sling.discovery.base.its.setup.VirtualInstance;
import org.apache.sling.discovery.base.its.setup.VirtualInstanceBuilder;
import org.apache.sling.discovery.base.its.setup.mock.AssertingTopologyEventListener;
@@ -37,7 +38,7 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class OakDiscoveryServiceTest {
+public class OakDiscoveryServiceTest extends AbstractDiscoveryServiceTest {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -47,7 +48,7 @@ public class OakDiscoveryServiceTest {
private VirtualInstance instance2;
- protected OakVirtualInstanceBuilder newBuilder() {
+ public OakVirtualInstanceBuilder newBuilder() {
return new OakVirtualInstanceBuilder();
}
@@ -55,7 +56,7 @@ public class OakDiscoveryServiceTest {
public void setUp() throws Exception {
final org.apache.log4j.Logger discoveryLogger = LogManager.getRootLogger().getLogger("org.apache.sling.discovery");
logLevel = discoveryLogger.getLevel();
- discoveryLogger.setLevel(Level.TRACE);
+ discoveryLogger.setLevel(Level.INFO);
}
@After
--
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/08: 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
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.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit ed30aaa4113cbf5edda89e3ea9004c6906ed4f31
Author: Stefan Egli <st...@apache.org>
AuthorDate: Thu Oct 29 12:45:55 2015 +0000
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
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1711239 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/discovery/oak/OakDiscoveryService.java | 3 +-
.../discovery/oak/its/OakDiscoveryServiceTest.java | 186 +++++++++++++++++++++
.../oak/its/setup/OakVirtualInstanceBuilder.java | 4 +
.../oak/its/setup/SimulatedLeaseCollection.java | 8 +-
4 files changed, 199 insertions(+), 2 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 49c307b..49677c9 100644
--- a/src/main/java/org/apache/sling/discovery/oak/OakDiscoveryService.java
+++ b/src/main/java/org/apache/sling/discovery/oak/OakDiscoveryService.java
@@ -619,11 +619,12 @@ public class OakDiscoveryService extends BaseDiscoveryService {
logger.debug("checkForTopologyChange: not yet activated, ignoring");
return;
}
- BaseTopologyView t = (BaseTopologyView) getTopology();
+ DefaultTopologyView t = (DefaultTopologyView) getTopology();
if (t.isCurrent()) {
// if we have a valid view, let the viewStateManager do the
// comparison and sending of an event, if necessary
viewStateManager.handleNewView(t);
+ setOldView(t);
} else {
// if we don't have a view, then we might have to send
// a CHANGING event, let that be decided by the viewStateManager as well
diff --git a/src/test/java/org/apache/sling/discovery/oak/its/OakDiscoveryServiceTest.java b/src/test/java/org/apache/sling/discovery/oak/its/OakDiscoveryServiceTest.java
new file mode 100644
index 0000000..65f63a3
--- /dev/null
+++ b/src/test/java/org/apache/sling/discovery/oak/its/OakDiscoveryServiceTest.java
@@ -0,0 +1,186 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.discovery.oak.its;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.apache.sling.discovery.TopologyEvent.Type;
+import org.apache.sling.discovery.TopologyView;
+import org.apache.sling.discovery.base.its.setup.VirtualInstance;
+import org.apache.sling.discovery.base.its.setup.VirtualInstanceBuilder;
+import org.apache.sling.discovery.base.its.setup.mock.AssertingTopologyEventListener;
+import org.apache.sling.discovery.oak.OakDiscoveryService;
+import org.apache.sling.discovery.oak.its.setup.OakVirtualInstanceBuilder;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class OakDiscoveryServiceTest {
+
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ private Level logLevel;
+
+ private VirtualInstance instance1;
+
+ private VirtualInstance instance2;
+
+ protected OakVirtualInstanceBuilder newBuilder() {
+ return new OakVirtualInstanceBuilder();
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ final org.apache.log4j.Logger discoveryLogger = LogManager.getRootLogger().getLogger("org.apache.sling.discovery");
+ logLevel = discoveryLogger.getLevel();
+ discoveryLogger.setLevel(Level.TRACE);
+ }
+
+ @After
+ public void teartDown() throws Throwable {
+ final org.apache.log4j.Logger discoveryLogger = LogManager.getRootLogger().getLogger("org.apache.sling.discovery");
+ discoveryLogger.setLevel(logLevel);
+ if (instance1!=null) {
+ instance1.stopViewChecker();
+ instance1.stop();
+ instance1 = null;
+ }
+ if (instance2!=null) {
+ instance2.stopViewChecker();
+ instance2.stop();
+ instance2 = null;
+ }
+ }
+
+ /**
+ * Tests whether the not-current view returned by getTopology()
+ * matches what listeners get in TOPOLOGY_CHANGING - it should
+ * basically be the same.
+ */
+ @Test
+ public void testOldView() throws Throwable {
+ final org.apache.log4j.Logger discoveryLogger = LogManager.getRootLogger().getLogger("org.apache.sling.discovery");
+ discoveryLogger.setLevel(Level.INFO); // info should do
+ OakVirtualInstanceBuilder builder = newBuilder();
+ builder.setDebugName("firstInstanceA")
+ .newRepository("/var/discovery/oak/", true)
+ .setConnectorPingTimeout(3 /* heartbeat-timeout */)
+ .setMinEventDelay(3 /*min event delay*/);
+ instance1 = builder.build();
+ instance1.stopViewChecker();
+// instance1.stopVoting();
+ TopologyView t1 = instance1.getDiscoveryService().getTopology();
+ assertFalse(t1.isCurrent()); // current it should not be
+ assertEquals(1, t1.getInstances().size()); // but it can as well contain the local instance
+ AssertingTopologyEventListener l1 = new AssertingTopologyEventListener("instance1.l1");
+ l1.addExpected(Type.TOPOLOGY_INIT);
+ instance1.bindTopologyEventListener(l1);
+ logger.info("testOldView: instance1 created, no events expected yet. slingId="+instance1.slingId);
+ instance1.heartbeatsAndCheckView();
+ Thread.sleep(200);
+ instance1.heartbeatsAndCheckView();
+ Thread.sleep(200);
+ instance1.heartbeatsAndCheckView();
+ Thread.sleep(200);
+ logger.info("testOldView: 2nd/3rd heartbeat sent - now expecting a TOPOLOGY_INIT");
+ instance1.dumpRepo();
+ assertEquals(1, l1.getEvents().size()); // one event
+ assertEquals(0, l1.getRemainingExpectedCount()); // the expected one
+ assertEquals(0, l1.getUnexpectedCount());
+ t1 = instance1.getDiscoveryService().getTopology();
+ assertTrue(t1.isCurrent()); // current it should now be
+ assertEquals(1, t1.getInstances().size()); // and it must contain the local instance
+
+ logger.info("testOldView: creating instance2");
+ builder.getSimulatedLeaseCollection().setFinal(false);
+ l1.addExpected(Type.TOPOLOGY_CHANGING);
+ VirtualInstanceBuilder builder2 = newBuilder();
+ builder2.setDebugName("secondInstanceB")
+ .useRepositoryOf(instance1)
+ .setConnectorPingTimeout(3)
+ .setMinEventDelay(3);
+ instance2 = builder2.build();
+ instance2.stopViewChecker();
+// instance2.stopVoting();
+
+ logger.info("testOldView: instance2 created, now issuing one heartbeat with instance2 first, so that instance1 can take note of it");
+ instance2.getViewChecker().checkView();
+ OakDiscoveryService oakDisco1 = (OakDiscoveryService) instance2.getDiscoveryService();
+ oakDisco1.checkForTopologyChange();
+ logger.info("testOldView: now instance1 is also doing a heartbeat and should see that a new instance is there");
+ instance1.getViewChecker().checkView();
+ OakDiscoveryService oakDisco2 = (OakDiscoveryService) instance1.getDiscoveryService();
+ oakDisco2.checkForTopologyChange();
+ logger.info("testOldView: 500ms sleep...");
+ Thread.sleep(500); // allow some time for CHANGING to be sent
+ logger.info("testOldView: 500ms sleep done.");
+
+ assertEquals(2, l1.getEvents().size()); // INIT and CHANGING
+ assertEquals(0, l1.getRemainingExpectedCount()); // no remaining expected
+ assertEquals(0, l1.getUnexpectedCount()); // and no unexpected
+ t1 = instance1.getDiscoveryService().getTopology();
+ assertFalse(t1.isCurrent()); // current it should not be
+ assertEquals(1, t1.getInstances().size()); // but it should still contain the local instance from before
+
+ builder.getSimulatedLeaseCollection().setFinal(true);
+ l1.addExpected(Type.TOPOLOGY_CHANGED);
+ logger.info("testOldView: now issuing 3 rounds of heartbeats/checks and expecting a TOPOLOGY_CHANGED then");
+
+ instance2.heartbeatsAndCheckView();
+// instance2.analyzeVotings();
+ instance1.heartbeatsAndCheckView();
+// instance1.analyzeVotings();
+ Thread.sleep(1200);
+ instance2.heartbeatsAndCheckView();
+ instance1.heartbeatsAndCheckView();
+ Thread.sleep(1200);
+ instance2.heartbeatsAndCheckView();
+ instance1.heartbeatsAndCheckView();
+ Thread.sleep(1200);
+
+ assertEquals(3, l1.getEvents().size()); // INIT, CHANGING and CHANGED
+ assertEquals(0, l1.getRemainingExpectedCount()); // no remaining expected
+ assertEquals(0, l1.getUnexpectedCount()); // and no unexpected
+ t1 = instance1.getDiscoveryService().getTopology();
+ assertTrue(t1.isCurrent()); // and we should be current again
+ assertEquals(2, t1.getInstances().size()); // and contain both instances now
+
+ // timeout is set to 3sec, so we now do heartbeats for 4sec with only instance1
+ // to let instance2 crash
+ builder.getSimulatedLeaseCollection().setFinal(false);
+ l1.addExpected(Type.TOPOLOGY_CHANGING);
+ for(int i=0; i<8; i++) {
+ instance1.heartbeatsAndCheckView();
+ Thread.sleep(500);
+ }
+ assertEquals(4, l1.getEvents().size()); // INIT, CHANGING, CHANGED and CHANGING
+ assertEquals(0, l1.getRemainingExpectedCount()); // no remaining expected
+ assertEquals(0, l1.getUnexpectedCount()); // and no unexpected
+ t1 = instance1.getDiscoveryService().getTopology();
+ assertFalse(t1.isCurrent()); // and we should be current again
+ assertEquals(2, t1.getInstances().size()); // and contain both instances now
+ }
+
+}
diff --git a/src/test/java/org/apache/sling/discovery/oak/its/setup/OakVirtualInstanceBuilder.java b/src/test/java/org/apache/sling/discovery/oak/its/setup/OakVirtualInstanceBuilder.java
index acf20e3..bfb7296 100644
--- a/src/test/java/org/apache/sling/discovery/oak/its/setup/OakVirtualInstanceBuilder.java
+++ b/src/test/java/org/apache/sling/discovery/oak/its/setup/OakVirtualInstanceBuilder.java
@@ -57,6 +57,10 @@ public class OakVirtualInstanceBuilder extends VirtualInstanceBuilder {
private OakBacklogClusterSyncService consistencyService;
private SyncTokenService syncTokenService;
+ public SimulatedLeaseCollection getSimulatedLeaseCollection() {
+ return leaseCollection;
+ }
+
@Override
public VirtualInstanceBuilder createNewRepository() throws Exception {
nodeStore = new MemoryNodeStore();
diff --git a/src/test/java/org/apache/sling/discovery/oak/its/setup/SimulatedLeaseCollection.java b/src/test/java/org/apache/sling/discovery/oak/its/setup/SimulatedLeaseCollection.java
index eed9568..02abf26 100644
--- a/src/test/java/org/apache/sling/discovery/oak/its/setup/SimulatedLeaseCollection.java
+++ b/src/test/java/org/apache/sling/discovery/oak/its/setup/SimulatedLeaseCollection.java
@@ -40,6 +40,8 @@ public class SimulatedLeaseCollection {
private final String viewId = UUID.randomUUID().toString();
List<SimulatedLease> leases = new LinkedList<SimulatedLease>();
+
+ private volatile boolean isFinal = true;
public SimulatedLeaseCollection() {
// empty
@@ -66,7 +68,7 @@ public class SimulatedLeaseCollection {
new DiscoveryLiteDescriptorBuilder();
discoBuilder.me(clusterNodeId);
discoBuilder.id(viewId);
- discoBuilder.setFinal(true);
+ discoBuilder.setFinal(isFinal);
List<Integer> actives = new LinkedList<Integer>();
List<Integer> inactives = new LinkedList<Integer>();
for (Map.Entry<String, Long> entry : leaseUpdates.entrySet()) {
@@ -99,4 +101,8 @@ public class SimulatedLeaseCollection {
clusterNodeIds.clear();
}
+ public void setFinal(boolean isFinal) {
+ this.isFinal = isFinal;
+ }
+
}
--
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/08:
[maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.0.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.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 524b1a9deaa9081eaa0c1c448ed0a9d5d129f940
Author: Stefan Egli <st...@apache.org>
AuthorDate: Mon Nov 2 16:13:15 2015 +0000
[maven-release-plugin] prepare release org.apache.sling.discovery.oak-1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1712062 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index a8d5b81..fad5fba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,15 +29,15 @@
<artifactId>org.apache.sling.discovery.oak</artifactId>
<packaging>bundle</packaging>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.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.0.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.0.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.oak-1.0.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] 03/08: SLING-5214: include
millis in testing log formats
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.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 680771e557dce5228af761d2317e43921c0ba95d
Author: Stefan Egli <st...@apache.org>
AuthorDate: Thu Oct 29 12:34:37 2015 +0000
SLING-5214: include millis in testing log formats
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1711236 13f79535-47bb-0310-9956-ffa450edef68
---
src/test/resources/log4j.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
index 7db291c..ec467a0 100644
--- a/src/test/resources/log4j.properties
+++ b/src/test/resources/log4j.properties
@@ -23,4 +23,4 @@ log4j.logger.org.apache.jackrabbit.core.TransientRepository=WARN
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
#log4j.appender.stdout.layout.ConversionPattern=%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L)\n
-log4j.appender.stdout.layout.ConversionPattern=%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m\n
+log4j.appender.stdout.layout.ConversionPattern=%d{dd.MM.yyyy HH:mm:ss.SSS} *%-5p* [%t] %c{1}: %m\n
--
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/08:
[maven-release-plugin] copy for tag org.apache.sling.discovery.oak-1.0.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.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 678ef3c6c1410865526cfc301f6be3a77983d66a
Author: Stefan Egli <st...@apache.org>
AuthorDate: Mon Nov 2 16:13:29 2015 +0000
[maven-release-plugin] copy for tag org.apache.sling.discovery.oak-1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.0.2@1712063 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] 01/08:
[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.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit cf00b6e9b386cde8f329014f1261983d2cc03dc5
Author: Stefan Egli <st...@apache.org>
AuthorDate: Mon Oct 26 16:36:06 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@1710653 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index ef48de1..6a795db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,15 +29,15 @@
<artifactId>org.apache.sling.discovery.oak</artifactId>
<packaging>bundle</packaging>
- <version>1.0.0</version>
+ <version>1.0.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.0.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.oak-1.0.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.oak-1.0.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] 06/08: @no-jira : adjusted
discovery.base and .commons dependency to 1.0.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.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit 122527ae2e38479a6bdc049df2eedd040911a279
Author: Stefan Egli <st...@apache.org>
AuthorDate: Mon Nov 2 16:03:03 2015 +0000
@no-jira : adjusted discovery.base and .commons dependency to 1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1712060 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index d7bf8ae..a8d5b81 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.1-SNAPSHOT</version>
+ <version>1.0.2</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.1-SNAPSHOT</version>
+ <version>1.0.2</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.discovery.base</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.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.0.1-SNAPSHOT</version>
+ <version>1.0.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>.